Unused imports, yep, again

Change-Id: I2f69c50eab069c29deb7ff9411b67a210099e8ed
Correcting a typo

Change-Id: I04d7c2aa6aaeede14aa6c18fc22a3f9e410dee0c
Merge "Correcting a typo" into jb43
Merge "Unused imports, yep, again" into jb43