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 am: 1a9b5e0fa3 am: 3c69e8d5fd
am: 8aa22eeac9

* commit '8aa22eeac9972de855d9b7b64bd9fb0eece0aaeb':
  Also fix out of bounds access for normal read