Merge "Make registerDefaultNetwork work on metered networks." into nyc-dev