Merge "Fix broken javadoc."