am 7c35a8e9: Merge "Fix crasher due to IndexOutOfBoundsException" into lmp-mr1-dev

* commit '7c35a8e9d185b044b4913b548a6245d46a589be3':
  Fix crasher due to IndexOutOfBoundsException