[automerger skipped] Merge changes Idaa27ce2,I06644a72,I453c63fe into rvc-dev...
[automerger skipped] Merge changes Idaa27ce2,I06644a72,I453c63fe into rvc-dev am: 7499783f -s ours am: aa1decbf -s ours
am skip reason: Change-Id Idaa27ce24cc13d13145eaef85a08b9033922c7bc with SHA-1 d1d5fdfc is in history
Change-Id: Ieb8f2627d1bc45d5df8495dd5e56655a8345ca3a