Removing some reflection code am: 6ff1ef17a2  -s ours
am: b7ad5f8e09

Change-Id: I9db8d7943c935592d0fe5e180a1b7e2c6648f565