[automerger skipped] Merge changes I57cb2003,I569d2b81,I01a10e36 into rvc-dev...
[automerger skipped] Merge changes I57cb2003,I569d2b81,I01a10e36 into rvc-dev am: ce7d0ba6 am: b3b15d17 am: 1e212c6e -s ours
am skip reason: Change-Id I57cb2003dd75b0bc5528978fd131730273e37a43 with SHA-1 ecfb05d4 is in history
Change-Id: Idc778341d12c2d9140cc389284519c214c85ca65