code cleanup- removed unused imports and rearranged import statements to match convention

Status Name Job ID Coverage
  Lint
canceled linting #18300
lint