Merge "Fix Checkstyle issues"