Fixes six imports

Change-Id: I4ee63d990bf95d74cadd1d65ad75f7fe26cc8fbd