Snap for 5706589 from 2e8621eedf4a324d43cb546843a9fcceb29b6dc6 to rvc-release

Change-Id: Ib9fb5a760203d47a6c3b27d26d0d5a0f169a775c