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