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

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