Snap for 6069976 from 571339d7fa613367c88a5c6eb935e57596b644e6 to rvc-release

Change-Id: Ie89c7cd4c171d74de905aa1f3a5b6485ae5deddc