Merge "Snap for 5050115 from b0dae4ddda607b97cf6800a749c738bce1c82101 to pie-vts-release" into pie-vts-release