Merge "Snap for 6216394 from 2e4003ba010ec7ac068fc989b6c906759100d613 to pie-vts-release" into pie-vts-release