Merge "Snap for 5714901 from 781e06ebf94322833b3b232638335ee6f31a527b to pie-vts-release" into pie-vts-release