Snap for 6671561 from dcee5a316d6a1c1fdaa95db34b696eb08636a1df to rvc-release

Change-Id: Ifc0ac85c480b2e5b8c575730e9cba91a913a1209