Merge "Add affinity model for contact names."