Clean up import-related lint violations.
Clean up name-related violations.