Snap for 6224475 from f812050941b9068ffcb21b3c99923d3a6f4be94e to rvc-release

Change-Id: I7f38912063c5c504c0ad9d52c1c23520c4bcf0e3