[automerger skipped] Merge changes I64f0866f,Idfc048d4 into rvc-dev am:...
[automerger skipped] Merge changes I64f0866f,Idfc048d4 into rvc-dev am: d55054d4 am: bef97c37 am: c92b3c38 am: 07e2d086 -s ours
am skip reason: Change-Id I64f0866fee078aa8b246c527c3c1196c8380783f with SHA-1 212a5f0e is in history
Change-Id: I219c46c2f260fb3fa52c032d90cb2cf71f3a9719