Merge branch 'for-4.16/hid-quirks-cleanup/_base' into for-linus