Snap for 6445537 from 5efba6ed34617984e9ecd11562fe73b7c86c2d67 to rvc-release

Change-Id: I6795b75c071ef91ea19a8d1b7afe881b3bd0aa60