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