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

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

Change-Id: Ic2cb7c7e4192e3cca24ccd3ff3bd2733f4886c48