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

* commit '6f7fd39536b8d3dd7c0a5bbd9350e473e559ebff':
  Fix write past end of memory.