Merge "Improve & reorganize logic related to directories/remote contacts in...
Merge "Improve & reorganize logic related to directories/remote contacts in the search fragment." am: 274b285b
am: da1d8244
Change-Id: If806ea1660625c95583963c1266bbd047d90f180