Snap for 6570104 from 469850ced6809208ebe78c9dae7f5da1fb0dc8c8 to rvc-release

Change-Id: Ifd012b4d5be43dd968259b8b83280f7265d12bd9