Merge \\\"Fix race with BT disable in BLE_ON_STATE\\\" into nyc-dev am: 1bf8782605 am: 8dad883759
am: 3971939a45

Change-Id: I0510f05b8ce3e5a343d392a72ea2328fc6d3573e