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