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

Bump version to 1.21.1