Snap for 6630029 from d477b94d83cf98fb0fdfc556a0344c37178b6484 to rvc-d1-release

Change-Id: I5aa56c5874d381b3c2fff87bcc4298dd668a1280