Merge "Snap for 5034923 from d72b0f3a9c8d6d17cedec2dcf107b1cf6ad2f955 to pie-vts-release" into pie-vts-release