Merge "Fixed a Bluetooth discovery bug." into lmp-dev