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