Merge "Only update declared methods during class redefinition." am: 4d0371a271 am: df066620b3 am: df846ebb2e
am: 012af626c9

Change-Id: I3115610695d5e668d2a1c6e3a8d3ee2e16466346