Cherry-picked 1.25.0_PRE2