Fixing import ordering to match coding style for files modified in #818