Merge "Fix ArrayIndexOutOfBoundsException crash" into lmp-mr1-dev