am a8fe1af4: am da4b7e89: Merge "Fix possible array access issue"

* commit 'a8fe1af4a0e33629ecda5dd22016a6aa6d1391ef':
  Fix possible array access issue