Snap for 5864382 from bd032964e6f8052b68e85313047f7dea970f9f92 to rvc-release

Change-Id: I4ccb2066fa1ca4d4ae829044e513e3face5fff02