Merge "Make 597-deopt-invoke-stub more solid."
am: f4ef5c6e25

Change-Id: I530a4bb5bd69fc9db9129ba970284938329530f6