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

Change-Id: I7ef55eddac20d58e9184056e85c9b49e733fd38d