Consolidate updating of reflective Field/Method references
am: c18eba327c

Change-Id: I5a9ee75d867f8ebf643dfc2bd6f5fe3e5357d52c