am cb3c9952: am dcff51a0: Merge "Revert "Do a second check for testing intrinsic types.""

* commit 'cb3c9952c81cabedcf9f5460d03d3c62ed3b461c':
  Revert "Do a second check for testing intrinsic types."