Make sure there are no unused import

Remove all currently unused imports
Prevent future unused imports

Change-Id: I6ac26d5c71b79952a7732db300355a00310c712e
Merge "Make sure there are no unused import"
Merge remote-tracking branch 'citrix/master' into build-temp