Merge "Prevent OOB error in rw_i93_sm_read_ndef()" into oc-dev