tree a540b86aa93770e950d1c4a7e46fe0390ec410e8
parent 1c549200ffb09659354845e8c60cb686bd8949fd
author Jie Luo <anandolee@gmail.com> 1698964081 -0700
committer Copybara-Service <copybara-worker@google.com> 1698964176 -0700

merge 25.x to main (#14617)

Closes #14617

COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/14617 from anandolee:25.x ac86c5ef32da07fe624428806beabab3bcc1ea0e
PiperOrigin-RevId: 578996979