Merge "Revert "Fiddle with 602-deoptimizable for adding debug info when it...
Merge "Revert "Fiddle with 602-deoptimizable for adding debug info when it fails."" am: c3776b8e am: e2ff0196
am: 1dc7bb1a
Change-Id: I5273a87570f132af01083cae5458eab133bf7afa