Removing a couple of unused imports

Change-Id: I210237ebf3bd44d59d00fbc039a4cc5ab77175cf
4 files changed