Merge \\\"Fix race with BT disable in BLE_ON_STATE\\\" into nyc-dev am: 1bf8782605 am: c535f2a520
am: db78416206

Change-Id: I9e9bcde7870f345dac8c5112b78de09263f17623