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

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