Merge pull request #11974 from protocolbuffers/22.x-202302161804

22.x 202302161804