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

* commit '4b97ca7682cde8eeec281efd488189b46ca4c986':
  API Review: Improve javadoc.