Remove unused imports

Change-Id: Idf2235300fa2c1c73563ddcff6ce9e84bd11ea0e
Merge "Remove unused imports"