Cleaned up unnecessary import statements.
Authored by: jwjoubert 2015-06-03
Parent: [r33350]
Child: [r33352]