Merge change I143ea844 into eclair

* changes:
  Add BMW and Audi to Auto Pairing black list.