[automerger skipped] Merge changes Ie3669798,I4b34cc34 into rvc-dev am:...
[automerger skipped] Merge changes Ie3669798,I4b34cc34 into rvc-dev am: 4ac0f0f3 am: db89bd94 am: 42fe6657 am: 9d2dc8ab -s ours
am skip reason: Change-Id Ie366979880bfc3b7e95a02957451736d724f838f with SHA-1 4e1ad4cb is in history
Change-Id: I804452ef986a49c141486d0ccb31b70ceb6f6bb4