remove obsolete imports

Change-Id: Ic5cc1c87a92f1bb84b67866c086830b536c7023b
Merge "remove obsolete imports"