am e96bc57a: Merge change I7d761ffa into eclair

Merge commit 'e96bc57aad64d435c1986bf415cb1c5f974426b9' into eclair-mr2

* commit 'e96bc57aad64d435c1986bf415cb1c5f974426b9':
  Fix best match resource selection when there's only one match.