Snap for 6188643 from 8fcb4fb5c580bfd9121dd8ddb93d4eb907d23f9e to rvc-release

Change-Id: I704989675c41022f65ca03c4777580d3cc38062b