Snap for 5605895 from fddd5670f254a38f82baa3ffb24c2270639d4882 to rvc-release

Change-Id: Iccb24313adc1ee1bb63a19e0673bb177a9af6693