Merge b8b13ebc25ae83d04a77c235eb1a0cedd00660bd on remote branch

Change-Id: Ic31c506b97bfcd08b11675e8f01ec66f388fc100
diff --git a/fm_hci/fm_hci.cpp b/fm_hci/fm_hci.cpp
index 527ecb4..04dea0c 100644
--- a/fm_hci/fm_hci.cpp
+++ b/fm_hci/fm_hci.cpp
@@ -430,7 +430,7 @@
     while (hci.state != FM_RADIO_DISABLING && hci.state != FM_RADIO_DISABLED) {
         //wait for rx event
         ALOGI("%s:before wait", __func__);
-        hci.rx_cond.wait(lk);
+        hci.rx_cond.wait(lk, []{return !hci.rx_event_queue.empty();});
         ALOGI("%s:after wait ", __func__);
         dequeue_fm_rx_event();
     }