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