Merge "nfc: Make NDEF validation stricter" am: f3a6269fed am: e6cb2aa614 am: 40c14a83d0
am: deac669a53

Change-Id: I208e9c5d6fbbfa9f3a6c0d43f38fcacc040ccb92