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

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