am e61e68d0: am 18d2d51e: am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev

* commit 'e61e68d001ac858d87a7f639515f12c3eafcd297':
  Improve some docs, fix some debugging.