Snap for 6224475 from 3e1d618b5c3c18081e26dc20b33f61f2da463c1d to rvc-release

Change-Id: I4bb97bbe3a789a4c81aa9fe2b3977ea0e047c45d