Snap for 6601700 from 7f3967fde877d2b25cd9bcc3c5cfca1f08474b83 to rvc-release

Change-Id: I9f43009d522b88d859c3eab1660c76a81be9a78e