Identical commit id from #26519
The test happens to cleanly merge and pass on 24.x as well, so there seems no risk in merging it. Though, feel free to close.
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--021abf342d371248e50ceaed478a90ca-->
See the guideline for information on the review process. A summary of reviews will appear here.
LGTM, but no clear opinion on whether this should be backported. It would definitely be good if we'd also backport other related changes, but not sure in a vacuum.
ok, closing for now