Snap for 5907574 from 27610526cba3a28e338f50a283074b068580ffc1 to rvc-release

Change-Id: Ief7e36e6a6d05ebbc4e65e9ebb489df9a0d0ee30