[automerger skipped] Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1e -s ours am: 26a62c0d -s ours
am skip reason: Change-Id I289d935f84b616ed857ef4c5a7427d57c282d00c with SHA-1 8de90318 is in history
Change-Id: I308d86910c877702cda6d0f3093c66700c68a862