Merge "Independent methods to enable/disable BLE mode" am: bb387436 am: df965872 am: 10a2b079 am: b3b7f6aa am: 6ddc9f2a Change-Id: I17325ff84e41595e0e974d5375bdfacb78eda208