Merge "nfc: Make NDEF validation stricter"