Merge "Fix javadoc for new API"