am a3efde54: am 6e979246: am 7712baa5: Merge "Fix a possible IOOB"

* commit 'a3efde54d75f05145f1c4a085ef569e7c970fa7f':
  Fix a possible IOOB