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

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