Remove unused imports from Repo

Some are not reported by PHPStorm, I found them with a regex.

Change-Id: Ia1cd608ab7bac79585f21a1cd15c0476ad97f3b2
Merge "Remove unused imports from Repo"