Merge pull request #25433 from jtattermusch/backport_25420

Backport #25420 into v1.36.x