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