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

Change-Id: Ia7a8c209cb4a743d369b51f0ddc3517d18d92f0a