Snap for 6272866 from 423129bb53e9c238342b14ffac2651a1a0142dc0 to rvc-release

Change-Id: I9abeb707d34232b54be6374a566b4796ec12af58