Merge "Rebasing ag/10503271 into the rvc-dev branch." into rvc-dev am: a8375cc9f8

Change-Id: I52889ed443de110209a12aa2b7a9bc55ad55b4ac