Merge "Snap for 5042378 from 4a004c90cf2c1deeb16f916cd641e66f31d19433 to pie-vts-release" into pie-vts-release