Prevent OOB error in rw_i93_sm_update_ndef() am: 8617cbb1a8
am: 8081839dc8

Change-Id: I585a178902f189e6ab44614dde5d307c46120c11