Merge "Fix javadoc build" into jb-mr2-dev