Merge "Snap for 6421512 from 7a2410e629ddf11f5faea02e97495d4501f1a9c1 to pie-vts-release" into pie-vts-release