[checkstyle] Fix checkstyle issues due to import organizing
12 files changed