diff --git a/frameworks/av/services/audiopolicy/common/include/policy.h b/frameworks/av/services/audiopolicy/common/include/policy.h
index bc4a585f9d9..69717aa1607 100644
--- a/frameworks/av/services/audiopolicy/common/include/policy.h
+++ b/frameworks/av/services/audiopolicy/common/include/policy.h
@@ -234,6 +234,8 @@ static inline audio_devices_t apm_extract_one_audio_device(
             return AUDIO_DEVICE_OUT_SPDIF;
         } else if (deviceTypes.count(AUDIO_DEVICE_OUT_HDMI) != 0) {
             return AUDIO_DEVICE_OUT_HDMI;
+        } else if (deviceTypes.count(AUDIO_DEVICE_OUT_USB_HEADSET) != 0) {
+            return AUDIO_DEVICE_OUT_USB_HEADSET;
         } else {
             std::vector<audio_devices_t> a2dpDevices = android::Intersection(
                     deviceTypes, android::getAudioDeviceOutAllA2dpSet());
diff --git a/system/media/alsa_utils/alsa_device_proxy.c b/system/media/alsa_utils/alsa_device_proxy.c
index 376ae8959de..5369d5e75ef 100644
--- a/system/media/alsa_utils/alsa_device_proxy.c
+++ b/system/media/alsa_utils/alsa_device_proxy.c
@@ -117,10 +117,10 @@ int proxy_prepare(alsa_device_proxy * proxy, const alsa_device_profile* profile,
     int max_rate_index = proxy_scan_rates(proxy, profile->sample_rates);
     if (max_rate_index >= 0) {
         if (proxy->alsa_config.rate > profile->sample_rates[max_rate_index]) {
-            ALOGW("Limiting sampling rate from %u to %u.",
+            ALOGW("Limiting sampling rate from %u to %u. FA",
                   proxy->alsa_config.rate, profile->sample_rates[max_rate_index]);
             proxy->alsa_config.rate = profile->sample_rates[max_rate_index];
-            ret = -EINVAL;
+            //ret = -EINVAL;
         }
     }
     return ret;