[Contacts Haida] Lint fixes