Fixes import order nits

Change-Id: I4fdc8eed74dd90d6450864daba7492d5e7266448
Merge "Fixes import order nits"