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

* commit '30ebda58388e7c251e04fe0dfdc30e23010d0a4f':
  Disable vendor id filtering for OS X.