[automerger skipped] Merge changes I64f0866f,Idfc048d4 into rvc-dev am:...
[automerger skipped] Merge changes I64f0866f,Idfc048d4 into rvc-dev am: d55054d4 am: bef97c37 am: 659a4547 am: 6e24b4cd -s ours
am skip reason: Change-Id I64f0866fee078aa8b246c527c3c1196c8380783f with SHA-1 a8805c6d is in history
Change-Id: I2ea6d60fcdc807ed5ccc58a485458edda255740c