Merge "Fix minor issues regarding checkstyle"