Remove unused imports

Change-Id: I173a4523c084a94094e9303a91546c70b299c661
Merge "Remove unused imports"