Merge "Snap for 4994203 from bf833ed9a8c69e312416c520bad583944e5bd34c to pie-vts-release" into pie-vts-release