Cherry-pick #8461 to the 3.16.x branch#8465

acozzette merged 1 commit intoprotocolbuffers:3.16.xprotocolbuffers/protobuf:3.16.xfrom

acozzette:cherry-pick-8461acozzette/protobuf:cherry-pick-8461Copy head branch name to clipboard