Lint: Remove unused imports

Change-Id: I59529ae4dd9351bb4a6881be97752f4a013df1eb
2 files changed