Snap for 6690197 from 2008be86fd17f936fc46410f2086f1a617a33f9d to rvc-release

Change-Id: If3d7cb32e6cba792a1632f423694fabca8543dbe