am c8648718: am 934af544: am 04301e3d: am 3845f270: am 27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev

* commit 'c8648718db9c05482579a46e48907851849b1670':
  Fixed a Bluetooth discovery bug.