Fix import order nits

Change-Id: I7c95fa2db1d719f6ed34468ad12b7a9e4c9e794d