Snap for 5845878 from 19a0b933176de98224ea77b2214eedda30fedd28 to rvc-release

Change-Id: Ifee9fb368cd887be44c55fcfe5b971cd93c887b6