Merge "Support normalization of numbers in Cp2PhoneLookup." am: 00006c32f2
am: a3c83886cf

Change-Id: I071a8e6572cb5c88cd494dae132b5531cbafcf7b