[automerger skipped] Merge changes Ie3669798,I4b34cc34 into rvc-dev am:...
[automerger skipped] Merge changes Ie3669798,I4b34cc34 into rvc-dev am: 4ac0f0f3 am: db89bd94 -s ours
am skip reason: Change-Id Ie366979880bfc3b7e95a02957451736d724f838f with SHA-1 892d1475 is in history
Change-Id: I4d914e8a877cb96e9f13eea3ef0be542dbed661d