Backport 1.8 3818

Backport #3818: `Fix platform detection for intel platform`.