Merge "Also fix out of bounds access for normal read" into klp-dev am: dc17049b02
am: fc4f739667

* commit 'fc4f739667f3eaa06f28a883f72a798db3e98027':
  Also fix out of bounds access for normal read