Removing some reflection code
am: 6ff1ef17a2  -s ours

Change-Id: Ibfc257848b9714a592c016f7f72ead30eabbdc65