remove unused imports

Change-Id: I39c0de99fac423858da8c76f6cfff27b21a65601
Closes-Bug:1279644
Merge "remove unused imports"