Fix unnecessary type paramatersCan be inferred by the compiler.Change-Id: If880ddfb7d7af2be70729d0c9f73c7c821b9c652