Remove type parameter by using type interence

Change-Id: I59868219a34a7280a0df4173ec0b401170f10457