Merge "Merge cherrypicks of [947592, 947593] into pie-cts-release" into pie-cts-release