Snap for 6142138 from cc4959a9e23c479b0775086d8d21ad1507307b0e to rvc-release

Change-Id: I5f372ad8d176d766ca9e219c1626c21ad39d54f7