Removing some reflection code
am: e2ec8a3cd5

Change-Id: I4b71a6fa63e16324c8b6c70812827db81d62b443