Merge "Bluetooth: Fix null pointer dereference" into msm-3.0