Fix import order nits

Change-Id: I972c463131ba688ab9352590eb53f5b1822ac943
Merge "Fix import order nits"