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