Merge "Update Bluetooth api"