Style fixes to imports

Change-Id: I1e7f30599df603c84b33f379aae4d9103a98a7a6