Drop unused imports

Change-Id: I2aaf8f490d23469bef4d3ee69fdb96ecbc10c376
Merge "Drop unused imports"