Snap for 5713261 from d5983c61a1aa354f45bf10724172715d49f5470f to rvc-release

Change-Id: Ib6c3bcffe8a394a34e225eb62e357edc8a90542c