Reduced Warnings by adding Type Arguments and removing unused imports

Change-Id: I42f8f9f9a6a6b271eaeb1a02f6d6567a630936ea
1 file changed