Fixes import order errors

Change-Id: I3df7bfb2e0812b006fa41bd76fb6156ebcd74362