Merge "Use InetAddress instead of String in network events." into oc-dev