Merge "carrier id APNs duplicates in restore"