Merge "Replace PhoneLookupSelector with PhoneLookupInfoConsolidator."