am 019f8cb8: Merge "Add bounds checks before accessing ArrayList." into klp-dev

* commit '019f8cb8a78c5584618655f5478d9a9f3dedc3f0':
  Add bounds checks before accessing ArrayList.