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

* commit '22a43d199a267e20dc5c68c7e30baeb21fc9b79d':
  Transferring directory display name logic to directory providers