Net/Bluetooth: Backport from msm-3.0.8, prep for future backports