Merge "Rebasing ag/10503271 into the rvc-dev branch." into rvc-dev am: a8375cc9 am: 3fc897d7 am: 596f636a Change-Id: Id90137401e93b2f0f4d7e30471bea613aa9e179a