[automerger skipped] Merge changes I655211e0,Ifaecb49a into rvc-dev am: a89c6163aa am: 753d22c70b am: 503df111ce -s ours
am skip reason: Change-Id I655211e0b9aa4bd7cb3718b6f567f0aa1a0176a5 with SHA-1 595adc05e8 is in history
Change-Id: I9637703df68eddeb7e39e7f318cd993b60827428
This commit is contained in: