DO NOT MERGE Fix out-of-bounds write

Bug: 26365349
Change-Id: Ia363d9f8c231cf255dea852e0bbf5ca466c7990b
(cherry picked from commit 5403587a74aee2fb57076528c3927851531c8afb)
1 file changed