Snap for 6424828 from 901a08a73484b0989530fb9fc7de0829d13d6757 to rvc-release

Change-Id: I3bbfe4f5d361406b4fd073014ca47a25eb2a931f