Remove unused imports

Change-Id: I78b387b193c90d132f1817ac40e78a7df66a4f17
Merge "Remove unused imports"