Snap for 7239954 from f52bf29d5eff0549d77ac657d96b6da89fc9ddc7 to rvc-d2-release

Change-Id: Ia4c7c5b8b8405bd997be6a40061301373046bd2b