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

Change-Id: I67440ec3565d00b7e9fa14f5d494a025f21191cd