[automerger skipped] Merge changes I9d38c696,I8da6a8f4 into rvc-dev am:...
[automerger skipped] Merge changes I9d38c696,I8da6a8f4 into rvc-dev am: 2bfc0b37 am: 15de8ddc am: 4d6fef4f am: e4bc9d85 -s ours
am skip reason: Change-Id I9d38c696bf1b3b63be3b9df3161168ee291e7beb with SHA-1 675274fa is in history
Change-Id: Ica8f452d1c603af464725ccb8b2b6d454d2bd2a9