Merge "Snap for 6885756 from 6c89beb79156c8067386b303bb447317cbc02180 to pie-cts-release" into pie-cts-release