Bluetooth changes for cm-10.1

Signed-off-by: David Rodero <david@codiguiel.net>