am 16f676f4: Merge change 6660 into donut

Merge commit '16f676f4f8ae3807b5cb40086048e48cae4be3cf'

* commit '16f676f4f8ae3807b5cb40086048e48cae4be3cf':
  Fix a small bug in array length bounds checking.