Snap for 6160382 from 6c3c7a19951358eb7f908059de61d3c248248601 to rvc-release

Change-Id: I293c7098c78217d6dc352b3707b19e7938c319d2