[automerger skipped] Merge changes Ib293173b,I9244baf7 into rvc-dev am:...
[automerger skipped] Merge changes Ib293173b,I9244baf7 into rvc-dev am: 05331bc9 am: 93e31381 -s ours am: b5297226 -s ours
am skip reason: Change-Id Ib293173bb2512553bacb9a35dcf0f82bb290ede8 with SHA-1 6c0c866f is in history
Change-Id: I7b75f6062ad7cd851fc849aa9a3f34f3efe605bd