Merge v1.13.x into master #1609

Job	Run time
Windows grpc-tools Build (ia32)	44s
Linux grpc-tools Build	4m 47s
Macos grpc-tools Build	2m 10s
Windows grpc-tools Build (x64)	54s
Combine grpc-tools artifacts	0s
	8m 35s

Provide feedback