Snap for 6668007 from 8272339d93adb8490a5837aeca008ad2e7ebe3f2 to rvc-release

Change-Id: I2f007fa202ab2dfa2e91d19a6da424630e252c12