Merge pull request #13971 from apolcyn/upmerge_v18x

Upmerge v1.8.x into master