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