Merge "Keep the '+' when normalizing the phone number"