Merge "Fix checkstyle import ordering issues"