Merge pull request #19107 from srini100/v1.21.x

Bump to v1.21.1-pre1