am cdfe8b93: Merge "Add affinity model for contact names."

* commit 'cdfe8b93ec8098c1c39a156948d9a79963dfd90e':
  Add affinity model for contact names.