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

Change-Id: I05a0d4232d652b30caec8d63a01282cdaabf130d