Merge "Update javadoc" into jb-mr1-dev