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

Change-Id: Id4761d4e1a64a20f597286890a95b1c375a0ba05