Move delayed imports so they work

Change-Id: Ia5bb0ca8192a170edb8465c8276ff0cada4e3aa5