Merge "Fix obsolete javadoc." into lmp-sprout-dev