More bluetooth configuration

Change-Id: I207de5c115e1fc97ea7813d014dd2cab8f7ade93