Snap for 6029552 from 73742bb28c80d18583343852b8e5d9ea2c7e12f7 to rvc-release

Change-Id: I52a4b23616e542aa014aebdce3527adf06108b6e