Merge "Merge \\\"Fix race with BT disable in BLE_ON_STATE\\\" into nyc-dev am: 1bf87826 am: 8dad8837 am: 3971939a"