Merge "DNS Proxy should not hang on addresses containing null bytes"