Merge "PhoneNumberUtils API changes"