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