Add device specific headers
Remove not more valid entry
Typo
Sync with local sources
Typos