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
diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec
index 8a292af..e3770be 100644
--- a/ruby/google-protobuf.gemspec
+++ b/ruby/google-protobuf.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "google-protobuf"
-  s.version     = "3.24.0"
+  s.version     = "3.25.0"
   git_tag       = "v#{s.version.to_s.sub('.rc.', '-rc')}" # Converts X.Y.Z.rc.N to vX.Y.Z-rcN, used for the git tag
   s.licenses    = ["BSD-3-Clause"]
   s.summary     = "Protocol Buffers"