Merge "Add APNs for some carriers"