[automerger skipped] [automerger] [DO NOT MERGE]Prevent length underflow in NfcTag.cpp am: 96a10332c8 am: 4675f8788b am: d2dbaf8b16 am: f5ada89db2 skipped: a3e20aea92 am: a2f7debf2a -s ours am: c945f93b66 -s ours
am: 5c1eaee4b3 -s ours
am skip reason: subject contains skip directive

Change-Id: I71f158f400bdca047d5a9dbb5b5a4fe021c9c46c