am d9940d9e: am edf84da1: Merge "Use the network when generating the InetAddress." into mnc-dev

* commit 'd9940d9e87af80455c451bd16c4d728f11c977d7':
  Use the network when generating the InetAddress.