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

Change-Id: I6b5020e628beaf13ecb337c50bdda94dc1d7c954