Snap for 6948038 from 1a0b4a45be062cfd2e898c0c94ef8dd3fcded422 to rvc-platform-release

Change-Id: I21203159be02a21b325f8851d162b1f8cc152b48