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

* commit '00af63a3540628acd652067dcc77729af8326871':
  Use the network when generating the InetAddress.