Merge "Fix javadocs to fix build." into jb-mr1-dev