[automerger skipped] Merge changes I0877f915,If6889737 into rvc-dev am:...
[automerger skipped] Merge changes I0877f915,If6889737 into rvc-dev am: e1741183 am: 13baae64 am: 41f3c6d5 am: 3dce68c8 -s ours
am skip reason: Change-Id I0877f915479a52746ed7aeb72888deffeec81a69 with SHA-1 77b064fd is in history
Change-Id: I1ce4d1cb4427e172850d2ddfa4c9b19c8b3ad082