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