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

Change-Id: Ibce29dfc10f83924a916283af5bf5fdcc869dd5f