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