Merge pull request #21980 from apolcyn/backport_pr

Backport https://github.com/grpc/grpc/pull/21977 to 1.27.x