Merge "More robust 652-deopt-intrinsic." am: 5154e2a89a am: 917f876b7e
am: 85faf7fd6a

Change-Id: I10f5795c308ef607ea157bf4a8f8e1025eeda59a