diff --git a/bluetooth/manifest_bluetooth.xml b/bluetooth/manifest_bluetooth.xml
index d9a378e..e2f7cfa 100644
--- a/bluetooth/manifest_bluetooth.xml
+++ b/bluetooth/manifest_bluetooth.xml
@@ -35,4 +35,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>hardware.google.bluetooth.ewp</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IBluetoothEwp</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
 </manifest>
diff --git a/cheetah/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml b/cheetah/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml
new file mode 100644
index 0000000..46c95af
--- /dev/null
+++ b/cheetah/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+  <bool name="enable_ons_auto_provisioning">true</bool>
+</resources>
diff --git a/device-cheetah.mk b/device-cheetah.mk
index adeae7d..e726551 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -234,6 +234,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
     ro.bluetooth.leaudio_offload.supported=true \
     persist.bluetooth.leaudio_offload.disabled=false
 
+# Bluetooth EWP test tool
+PRODUCT_PACKAGES_DEBUG += \
+    ewp_tool
+
 # userdebug specific
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
     PRODUCT_COPY_FILES += \
diff --git a/device-panther.mk b/device-panther.mk
index 3dec34b..82877c3 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -226,6 +226,11 @@ PRODUCT_PRODUCT_PROPERTIES += \
     ro.bluetooth.leaudio_offload.supported=true \
     persist.bluetooth.leaudio_offload.disabled=false
 
+
+# Bluetooth EWP test tool
+PRODUCT_PACKAGES_DEBUG += \
+    ewp_tool
+
 # userdebug specific
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
     PRODUCT_COPY_FILES += \
diff --git a/panther/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml b/panther/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml
new file mode 100644
index 0000000..46c95af
--- /dev/null
+++ b/panther/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+  <bool name="enable_ons_auto_provisioning">true</bool>
+</resources>