Merge branch 'for-4.20/apple' into for-linus