Fixed a few incorrect generic types that didnt use appropriate wildcards.

Change-Id: I394d47d7b7b21934336cfe5a2efdb00fa51e5dc8