Merge "Handling timeout in PeopleApiPhoneLookup & Cp2ExtendedDirectoryPhoneLookup"
am: 87300f1c76

Change-Id: I98e9d877236fa22df8f4ce3d769e0afa4e030376