Unused imports and SuppressWarnings dropping.

Change-Id: I3a40a0f049f018a7be98acf82b81bb3288600243