Merge "Disable vendor id filtering for OS X."