Merge "Remove checkstyle issues"