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