am 356ba8bc: Merge "Transferring directory display name logic to directory providers" into honeycomb

* commit '356ba8bcd2d715a9f036d5e7b82e865be070681c':
  Transferring directory display name logic to directory providers