Merge "Improve & reorganize logic related to directories/remote contacts in the search fragment."
am: 274b285b60

Change-Id: Ib486facb271f0a659631c24e5ba6318e500db6e9