[NFC Contacts] Lint changes