Merge pull request #19007 from srini100/master

Upmerge from v1.20.x