Snap for 6664334 from 333f3c1db96e0e0648e73b383a893ec6c29dbbd0 to rvc-release

Change-Id: I1ea48133f32324b6bf3cddde89952e1383e3e72c