Fixes import order nits

Change-Id: I6085bb4a0b990985c8f7a013c89b7d5acafdf312