Unused imports, yep, again

Change-Id: I2f69c50eab069c29deb7ff9411b67a210099e8ed
Merge "Unused imports, yep, again" into jb43