[automerger skipped] Prevent OOB in rw_i93.cc am: 49aa830b am: 942ced44 am: c361de0e -s ours am: 2ad3313a -s ours am: c803ab56 -s ours am skip reason: change_id Ife24f097c926184019038e559cbd806b289911c6 with SHA1 4025e2b9 is in history Change-Id: I83a3b3b23a953d509dcdbe2b8d38da9baa48afce