Merge "DO NOT MERGE: Javadoc fix." into lmp-preview-dev