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