[automerger skipped] Merge changes I97015365,Ic9db4b9b into rvc-dev am:...
[automerger skipped] Merge changes I97015365,Ic9db4b9b into rvc-dev am: 1cb71607 am: 31947654 -s ours
am skip reason: Change-Id I97015365604be1846e3ecbaf60ac99e334705565 with SHA-1 cc4ed0c6 is in history
Change-Id: I07fe90085cb201a3280241773282e14be9ce904a