Get rid of cyclic imports

Change-Id: Ia0ea406668eadbd8db1c660fcd6c231af21651c7
Merge "Get rid of cyclic imports"