Snap for 6269144 from 802324b83f203f6f6d9adce4f7b739cceb48c0fe to rvc-release

Change-Id: I3b1ac01cd0ac47986d2eef647a5b4a74357141f3