[automerger skipped] Merge changes Ib293173b,I9244baf7 into rvc-dev am: 05331bc94b am: 93e313811c am: 44c91a0f4c am: e8b3229524 -s ours

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

Change-Id: I5e1742ea9e4d076abfc951410a72e355500fa93f