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

Change-Id: I4c2be378d921cf750a7e856eecb6f00fba96051a