Snap for 6507440 from 9b995536aba7ee8dd47880bb611b6e49f16add24 to rvc-release

Change-Id: Ia04bc28c8114469ad1f8e2d259f6d5d6fa49434a