Snap for 6203617 from 890cd853d4776737e72b9a7b646c57693aff2a68 to rvc-release

Change-Id: I3a430d2e71409d1a2f7b3714f0c1e767af7de04a