[automerger skipped] Merge changes I97015365,Ic9db4b9b into rvc-dev am: 1cb71607bc -s ours

am skip reason: Change-Id I97015365604be1846e3ecbaf60ac99e334705565 with SHA-1 cc4ed0c621 is in history

Change-Id: I4902fda4482ecad8ae6c38b32da0f40262cb316a