Remove unused imports

Change-Id: I7524f52ce0615fcad17b778b65a2733dca12705f
Merge "Remove unused imports"