Snap for 6305839 from 5bee1f934b5491202985eecbad74cdc2c941ee15 to rvc-release

Change-Id: I369426d1251a6a4f35841e8a60f6f3d9afe0af40