Snap for 6134912 from 9e48b51aa8be8e902c10b1ec2661d64cc28ace45 to rvc-release

Change-Id: I9edf9b707ec68df414e3766913a47849228788e9