Merge "Handling timeout in PeopleApiPhoneLookup & Cp2ExtendedDirectoryPhoneLookup"