Merge "NFC: Fix for wrong chip version."