Merge "Fix the javadocs error in jenkins"