XX-10872: Fix checkstyle