[automerger skipped] Merge changes I5e12b2c7,Ic79effb1 into rvc-dev am:...
[automerger skipped] Merge changes I5e12b2c7,Ic79effb1 into rvc-dev am: 1cb0a63d -s ours am: a4034e27 -s ours
am skip reason: Change-Id I5e12b2c7248074d10affb6c28d1866d4589cb9e8 with SHA-1 5992b18e is in history
Change-Id: I4aa75655df3bea7dbe29d6cda598990cfdd844bb