Merge "Bluetooth: Fix Resource Leak in OPP (1/2)"