Merge "Fix Legacy NetworkInfo API"