[automerger skipped] Merge "Prevent OOB read in rw_t4t.cc" into oc-dev am: 26d4ace6f5 am: e6214352dc
am: 58e2d3b31e -s ours
am skip reason: change_id Id1b07fa79edabaf27e18a7147d1e7ae66cf3c4b3 with SHA1 38e3ecb36c is in history

Change-Id: I4f3bdcc97ba7584ddf6a6893f5d752a38bc7e9f4