Consolidate updating of reflective Field/Method references am: c18eba327c am: b66db57207
am: 922149c11f

Change-Id: I46f5b910c520e0cbde250d25148a9abc1281f060