Snap for 6948038 from 47cd779f7f440bdc43e746f0ccbd6bc87426855a to rvc-platform-release

Change-Id: I5a3fd3566e80a804ec821916354874feb9405f41