Cherry pick PR 35306 and 35336 - #35339

Merged

shunping merged 2 commits into

apache:release-2.66from

shunping:cherry-pick-35306-35336-second-attempt

Jun 17, 2025

Commits on Jun 17, 2025

Reverts #35202 (#35306)
akashorabek
authored and
shunping
committed
9acd8b0
Fix flaky precommit java test on prism caused by PR 35202 (#35336)
shunping
committed
ce784e5