Merge pull request #12199 from protocolbuffers/22.x-202303101751

22.x 202303101751