Merge pull request #14502 from stangri/18.06-https-dns-proxy