Merge pull request #14500 from stangri/master-https-dns-proxy