Actually make DI and CT work

Change-Id: Ic2625a648394d2ae9a7434546c1033f792d0ad50