Snap for 6069976 from c3c3f12fb221c98d54db238279daae1956731e04 to rvc-release

Change-Id: I3602d3c0eefd3855e8a4e449a26b3619eea1b784