Merge "Snap for 6667424 from a11a76140d133d5c9d19e2b1d49156c5db827a52 to pie-cts-release" into pie-cts-release