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

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