Merge "NFC: Add error handling to i2c access"