Merge "Fix checkstyle warnings"