[automerger skipped] Merge changes I5e12b2c7,Ic79effb1 into rvc-dev am:...
[automerger skipped] Merge changes I5e12b2c7,Ic79effb1 into rvc-dev am: 1cb0a63d am: ee1682a8 am: 4ca011df am: a4c91703 -s ours
am skip reason: Change-Id I5e12b2c7248074d10affb6c28d1866d4589cb9e8 with SHA-1 242a9f8d is in history
Change-Id: I7f4d307b6c2ff4f9c0779774523300b8ec64878e