Merge "Move away from deprecated NetworkInfo extra."