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