[core] Fix s2 build after crc header fix (#8459)

Sync Device Classes

Canceled