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