Fix import

Fix import of modules that should be imported explicitly.

Test: unittests
Change-Id: I83162c527174fa359e4303f1f38a00d38eb7a953
1 file changed