Snap for 6157842 from fd7ccd4325d4215fa74d1dd593a69555475025d8 to rvc-release

Change-Id: Id8e85b40cf586779f74c128c76257ee1967ea4cb