Merge "Snap for 5771430 from 5ac7f3b838c6fb270f8c536b55d2d912d0fe3121 to pie-vts-release" into pie-vts-release