Merge \"Make registerDefaultNetwork work on metered networks.\" into nyc-dev
am: 33cdc4d136  -s ours

Change-Id: Iacee53c01e7de163e677ab57bc2d7044f8aff952
tree: e39bcc0d738cf4df520d9d468929acb64d3bc8c1
  1. core/
  2. services/
  3. tests/