Merge "Snap for 5063321 from 00d9027e38e8337b2358a06aa7e14840d6a1dfe9 to pie-cts-release" into pie-cts-release