am 3f805418: Merge "Fix an OOB exception" into jb-mr1-dev

* commit '3f80541844672a7625eb298adc6141ecf14bb883':
  Fix an OOB exception