Remove unused imports from Client

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

Change-Id: I6cd2db1d31ace633568573f66caafa0a30aefe84
Merge "Remove unused imports from Client"