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