Merge "Do not detect portals when DNS returns private IPs"