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

Change-Id: If08ae7a4eed5d56c02c0d67a3d3fcffe46f982b5