Prevent OOB error in rw_i93_sm_update_ndef() am: 8617cbb1a8 am: 8081839dc8 am: c80b838093 Change-Id: I8a102085d7ecfeb977d742ebc742e364752cc1b8 (cherry picked from commit c23e375317d638701d1f0c289c85b153ec461082)