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

Change-Id: I1c9354484c92be7aa9dfe85504951905876e23e7