[Contacts Haida] lint fixes