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

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