[automerger skipped] OOB write in rw_t2t_ndef.cc am: 76a5f2be am: 839e0a1f...
[automerger skipped] OOB write in rw_t2t_ndef.cc am: 76a5f2be am: 839e0a1f am: caf8c0d4 -s ours
am skip reason: Change-Id Ib22c24a2098e79b8519d3984a752e4b661fb1e59 with SHA-1 077c8cad is in history
Change-Id: I0c61297b7dc8971839f15bdef1685b70b1b2c221