[automerger skipped] Merge changes I38628dad,I2467b647 into rvc-dev am:...
[automerger skipped] Merge changes I38628dad,I2467b647 into rvc-dev am: e06f0ad6 am: 66f0fd57 -s ours am: 0090bc77 -s ours
am skip reason: Change-Id I38628daddcb7be7c74846e78d36dc88f065b97d9 with SHA-1 5d3d5aa5 is in history
Change-Id: I96b48d4a78b706e21734628668ea039e618f6b9f