Merge pull request #15697 from srini100/backport15690

Backport #15690 from master to v1.13.x