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

Change-Id: I36d0ea309395103da8b9c29f885d3e987ce0270d