Fixes import order nits

Change-Id: Ide6dff579a126c9af5b593f9ce541873a7643415