Merge change I738ed802 into eclair

* changes:
  Fix BMW and Audi auto pairing lists.