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

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