am 8525ab83: am 525db43b: am 6f7fd395: am 3fe9adc9: Merge "Fix write past end of memory." into lmp-dev

* commit '8525ab83fb70f0f5c8956ca349026466e0e98b6f':
  Fix write past end of memory.