[CheckStyle] Fix new Checkstyle errors