Merge "Prevent OOB error in rw_i93_sm_read_ndef()" into oc-dev am: 46f44fd653 am: e010bdd3de am: e079b7a95a Change-Id: I6e24e6eca85a59767f5227755389e63b32ad1254