Merge "Remove usage of NetworkInfo"