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

Change-Id: I852f07da627ed245020ad191c62eddba5e23af76