Merge "Remove stray unused import."