Merge \"Merge \\"Make registerDefaultNetwork work on metered networks.\\" into...
Merge \"Merge \\"Make registerDefaultNetwork work on metered networks.\\" into nyc-dev am: 33cdc4d1 -s ours\" into nyc-mr1-dev
am: 6f93a6c2
Change-Id: I160e1a702a5e879da775ddf9e360ef5c3d206973