Merge pull request #17019 from protocolbuffers/cp-27

Cherrypick editions fixes to 27.x