Snap for 5706589 from d2785fae863a3025a3bce9a6163b65218b4e310f to rvc-release

Change-Id: I69a2ec5ad9e72bf4031f926d83167b1eb3bb8f1f