Merge "Merge cherrypicks of [811267] into pie-cts-release" into pie-cts-release