Merge "Snap for 5590171 from b1a0c215927dc0b9240c14892e3a041ef850dc57 to pie-vts-release" into pie-vts-release