[automerger skipped] Merge changes I38628dad,I2467b647 into rvc-dev am:...
[automerger skipped] Merge changes I38628dad,I2467b647 into rvc-dev am: e06f0ad6 am: 66f0fd57 am: ea959b04 am: 785d5d20 -s ours
am skip reason: Change-Id I38628daddcb7be7c74846e78d36dc88f065b97d9 with SHA-1 87cfa0d8 is in history
Change-Id: Id47978a13ba61df23e68a0f2cd0668fc5157674d