Enable BLE

Change-Id: Ifa5308ed5bcd07ea77ecd05ae5f7e0fad2da32a9
Merge branch 'cm' into HEAD