Unused imports, they just keep coming

Change-Id: I55cabb2218ebc5023ea2de82d61fae85c5d393f9
Merge "Unused imports, they just keep coming" into jb43