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

Change-Id: I3013372839f6adae15546cddec837a601c8eca28