Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev