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