Snap for 5968874 from 04be62d67d257594983700351f7f9983d40192ce to rvc-release

Change-Id: Ibd0588c3de5491440b1095258292815af5e8ad98