Merge "Support normalization of numbers in Cp2PhoneLookup."