Merge "Deprecate most of NetworkInfo." into pi-dev