am 1377fe31: Merge "API Review: Improve javadoc." into lmp-dev

* commit '1377fe31f3d655e5d764b213904131f7e75a870d':
  API Review: Improve javadoc.