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

* commit '8f6928f1399620ce432b82d046912e2030d6511c':
  Improve some docs, fix some debugging.