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