Merge "Fix javadoc." into lmp-mr1-dev