Merge "Merge "Use InetAddress instead of String in network events." into oc-dev am: 54e534d6e7 am: c3ae946f66"