Remove unused imports

Change-Id: I93ff9582ca15c8ac87279bddf16983a9571e5a23
Merge "Remove unused imports"