Merge "Add Javadoc" into jb-mr2-dev