Merge "Fix the Checkstyle issues"