Merge "[automerger skipped] Prevent OOB in rw_i93.cc am: 49aa830b5d am: 942ced44bb am: c361de0e8e -s ours am: 2ad3313a03 -s ours am: c803ab5629 -s ours am: 0b27ba9bae -s ours am skip reason: change_id Ife24f097c926184019038e559cbd806b289911c6 with SHA1 4025e2b929 is in history" into qt-r1-dev-plus-aosp