[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 skip reason: Change-Id Idaa27ce24cc13d13145eaef85a08b9033922c7bc with SHA-1 4f55f3ef is in history
Change-Id: I4688e1fad465178dc28e7e4cb147b1b88466cc09