Merge "Snap for 7080421 from f79b99d03000524706b5f2d8259058d2ed95ad2d to pie-cts-release" into pie-cts-release