Snap for 6586393 from 5b07711b88d8a47c67a617a0fbe044a8bfa4e4a5 to rvc-release

Change-Id: Ief58400f1b4d3429bd46546ec8ce1a1eca677c7f