Removing deprecated imports.

Change-Id: Ia1ee1acf3de30e138e808bded033daea9f7d99ce