Fix import ordering and unused imports

Test: TH
Change-Id: I652c75c0c301df0040131f75f369065ea0a58250
1 file changed