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

* commit '525db43bf5351865a0483eb7f20d171a4895788b':
  Fix write past end of memory.