Merge "Fix 2 broken PhoneNumberUtilsTest."