Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac8f617b am: e2e46f5fa1 am: 2304c606eb am: 0945199000 am: a39f981875
am: e463301aa4

* commit 'e463301aa44f0ea0ae1a2399bf8800d94cf6ce3e':
  Fix out-of-bounds write