[automerger skipped] Merge changes Ib293173b,I9244baf7 into rvc-dev am: 05331bc94b -s ours am: 39d7befa1d -s ours

am skip reason: Change-Id Ib293173bb2512553bacb9a35dcf0f82bb290ede8 with SHA-1 c4b71c9302 is in history

Change-Id: Ibf325955e9c1407c1d5c9a695902d7ffd297b5c1