Merge "[automerger skipped] Merge changes I2fcd093e,I24210426 into rvc-dev am:...

Merge "[automerger skipped] Merge changes I2fcd093e,I24210426 into rvc-dev am: 9113e7be -s ours am: fef2273d -s ours am: 0f89a5fe -s ours" into rvc-qpr-dev-plus-aosp am: fcfb73e7 -s ours

am skip reason: Change-Id I2fcd093e61afdd16d481194e1d5f8f66acf6a66c with SHA-1 61f4ab89 is in history

Change-Id: I4a805ba20dcec8e80d1697374e93c93ccaa4ef8d