Snap for 6149042 from 3c55a6df514dcfab825c1b48610938aaff2d49a4 to rvc-release

Change-Id: Ic86a58d5d667d88f1459a9e9398458d00a0ee520