Snap for 6586393 from 84dc3a45ee4e7d2e2cb7a91b305e0c8bed234817 to rvc-release

Change-Id: I6f58d1831ac50eda82705706595f8e338cfd7492