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

Change-Id: I71fcfb810a477f5bcc3d7642375c6ef56b747517