am f431ce3c: am 485a2013: am 33259fdf: Merge "Fix access past end of args array."

* commit 'f431ce3c1173025310f289da71df5f481163c61d':
  Fix access past end of args array.