[automerger skipped] OOB write in rw_t2t_ndef.cc am: 76a5f2be3f am: 839e0a1fcc am: caf8c0d4e7 -s ours am: 32b0c80cc2 -s ours
am skip reason: Change-Id Ib22c24a2098e79b8519d3984a752e4b661fb1e59 with SHA-1 077c8cad3e is in history

Change-Id: Ib2612bda5934650a9be1fad57792131c570b1372