diff --git a/device.mk b/device.mk
index d9051e0a..27ca987d 100644
--- a/device.mk
+++ b/device.mk
@@ -169,13 +169,10 @@ USES_LASSEN_MODEM := true
 ifeq ($(USES_GOOGLE_DIALER_CARRIER_SETTINGS),true)
 USE_GOOGLE_DIALER := true
 USE_GOOGLE_CARRIER_SETTINGS := true
-USES_GAUDIO := true
 endif
 
-ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
 # Audio client implementation for RIL
 USES_GAUDIO := true
-endif
 
 # ######################
 # GRAPHICS - GPU (begin)
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 14b43a18..d170208d 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -135,9 +135,9 @@
            <instance>default</instance>
        </interface>
     </hal>
-    <hal format="aidl" optional="true">
+    <hal format="hidl" optional="true">
         <name>vendor.google.wifi_ext</name>
-        <version>1</version>
+        <version>1.3</version>
         <interface>
             <name>IWifiExt</name>
             <instance>default</instance>