Snap for 6488384 from 6a335a153c0cdb091f288c648b947694923606dd to rvc-release

Change-Id: If69b6dc4dd76e6ea0edad021a126f3d55a76db1e