More bluetooth configuration

Change-Id: I677a4f0e377477667a31dd54a31c732b6ad435db