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