Merge "Fix checkstyle issues including javadoc"