Merge "Revert "Fiddle with 602-deoptimizable for adding debug info when it fails.""
am: c3776b8e12

Change-Id: Id94377bcb04e362b38d032078e21b04007ec0691