Merge "Deprecate NetworkInfo"