Merge "Bluetooth database log clean up"