Merge "Merge "nfc: Make NDEF validation stricter" am: f3a6269f am: e6cb2aa6 am: 40c14a83 am: deac669a"