Merge "Fixing checkstyle and javadoc errors"