Snap for 6610691 from 40b9508f2f9c1bf45e2b4b04339170488a263597 to rvc-release

Change-Id: I280687a78f5ef56cde0a2274b28ab0d58d7b392e