return Object.class when TypeVariable not definied

Change-Id: I01b7c4610b5baeb6ec41279119e9692f6e645319