[Contacts Haida] Lint changes