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

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