[automerger skipped] Merge "Prevent OOB read in rw_t4t.cc" into pi-dev am: 12319442 -s ours
am: 893c149a -s ours
am skip reason: change_id Id1b07fa79edabaf27e18a7147d1e7ae66cf3c4b3 with SHA1 f971aae2 is in history
Change-Id: Ibdc9e5a7a225db7738d5c59585533ef45fff1a71