Remove unused imports

Test: unit test
Change-Id: I01c4d0001fa76cb79f1c40ce40d9a55e3bd5623a
2 files changed