Merge "Fiddle with 602-deoptimizable for adding debug info when it fails." am: c7d2a83c am: cc0baef7 am: 2297a457 Change-Id: I4bba6e569744ade156c58ce2b247aaa1c47e711e