am 97e1e170: Merge "Disable vendor id filtering for OS X."

* commit '97e1e1704245d4c2edd8a9e155669aaae7341b7d':
  Disable vendor id filtering for OS X.