[automerger skipped] Merge "Prevent OOB read in rw_t4t.cc" into oc-dev am:...
[automerger skipped] Merge "Prevent OOB read in rw_t4t.cc" into oc-dev am: 26d4ace6 am: e6214352 am: 58e2d3b3 -s ours
am: 38778722 -s ours
am skip reason: change_id Id1b07fa79edabaf27e18a7147d1e7ae66cf3c4b3 with SHA1 38e3ecb3 is in history
Change-Id: I774ff8431a5dd56d68a91b8665f044254cf67b96