Snap for 6272866 from 2d91d0f69a63aa55b870405cc94fe23b2cf62703 to rvc-release

Change-Id: Id40a835c382c9b0169751f2b8eed4d9d56cd296b