Snap for 6154573 from 6f7beb94c6a3d619e35dd26354db41834a50c8ce to rvc-release

Change-Id: I63cfc35c41af9a2b997d109c29bcc02216f92453