Snap for 6610691 from 39268963d986165eef2688756a8424455a553ce0 to rvc-release

Change-Id: I9b600e3db3d912cbe5bb27386ce8e2b1a2628a7c