Merge "Also fix out of bounds access for normal read" into klp-dev am:...
Merge "Also fix out of bounds access for normal read" into klp-dev am: dc17049b am: fc4f7396 am: 2bb66e25 am: 5371723c
am: 9f31a893
* commit '9f31a893':
Also fix out of bounds access for normal read