Fixes import order nits

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