Snap for 6166993 from 3bd58ef772a3f8e8d76a2703112d88223ae7df97 to rvc-release

Change-Id: I0db85361774994493f0887b0faf8ef8266bd6c7d