Merge "Snap for 5009372 from bf833ed9a8c69e312416c520bad583944e5bd34c to pie-cts-release" into pie-cts-release