[automerger skipped] Merge changes I0877f915,If6889737 into rvc-dev am:...
[automerger skipped] Merge changes I0877f915,If6889737 into rvc-dev am: e1741183 am: b5ec0df5 am: 354893be am: f14ec9bf -s ours
am skip reason: Change-Id I0877f915479a52746ed7aeb72888deffeec81a69 with SHA-1 9adc508a is in history
Change-Id: I4c75e7e452bffd8a2153eb70d18a47256232a6da