am c0c7b32e: am 45e77ce3: Merge change I154386b1 into eclair-mr2

Merge commit 'c0c7b32e0b5ab6af749db638a7f08d8a3767d167'

* commit 'c0c7b32e0b5ab6af749db638a7f08d8a3767d167':
  Use unbundled QSB for global search