Backport #2746 and #2761 to 1.10.x#2777

murgatroid99 merged 2 commits intogrpc:@grpc/[email protected]grpc/grpc-node:@grpc/[email protected]from

murgatroid99:grpc-js_1.10_backportsmurgatroid99/grpc-node:grpc-js_1.10_backportsCopy head branch name to clipboard