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

* commit '04301e3d9b1b8dc0b21b97d01856474fa10990d5':
  Fixed a Bluetooth discovery bug.