Snap for 6948038 from 49b8e665f01b7160b83c4e4ac5cc508d480db572 to rvc-platform-release

Change-Id: I2ae1449f8531b2c04b8609539a51f82bd487a013