Remove unused imports

Change-Id: Ib08ad4447a07a1974ad05d70c47791aa66f7cbbc
Merge "Remove unused imports"