Merge "Verify addrs only against ports with fixed IPs"