More unused imports

Change-Id: I326517dd551b3d5486cafd2cf1720efba4bc9a07
Merge "More unused imports" into jb43