Removed merge annotations in BluetoothDiscoveryHandler