Fix import spacing violations (checkstyle) (#1086)

13 files changed