remove obsolete imports

Change-Id: Iacfcfe99b35adadce0c9ab1939734a0cab9043a1
Merge "remove obsolete imports"