Merge "Ensure redefinition does not break breakpoint deoptimization" am: 1613cd18a3 am: 134391527d
am: 656b0b25c0

Change-Id: If2c47871214c4c929e5cc4ef9eaf4b1c7d984831