Merge "Javadoc polish." into lmp-mr1-ub-dev