am 6d587ac3: am 48956ad3: am 3c58d279: Merge change I738ed802 into eclair

Merge commit '6d587ac372918783f54512bd00180bb44a49ab5b'

* commit '6d587ac372918783f54512bd00180bb44a49ab5b':
  Fix BMW and Audi auto pairing lists.