[automerger skipped] Merge changes I655211e0,Ifaecb49a into rvc-dev am: a89c6163aa -s ours am: 6cc54c5b5c -s ours am: 267ae80a3d -s ours am: c84cd0ab51 -s ours
am skip reason: Change-Id I655211e0b9aa4bd7cb3718b6f567f0aa1a0176a5 with SHA-1 482af2e2e8 is in history
Change-Id: I9fa2b502720ffba9ee34890300318ee5ff5bd9bd
This commit is contained in: