Bluetooth; finish backporting from 3.0.8 caf