Merge "Snap for 5007112 from c5614bd069ca6c5799c1fad71d94810446c7b7e3 to pie-vts-release" into pie-vts-release