Snap for 6286840 from bd58b599b90ee39aa199341b4f31612fae2588a5 to rvc-release

Change-Id: Idd6f0ca8d4d16a9d49900db4843320015fb5b1cb