diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
old mode 100755
new mode 100644
index fea8214b..ae64c3e1
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -34,4 +34,12 @@
    <integer name="config_sms_authorization_timeout_ms">15000</integer>
    <!-- Enable SMS authorization support -->
    <bool name="config_sms_authorization_enabled">true</bool>
+
+   <!-- List of regexpressions describing the interface (if any) that represent tetherable
+          Wifi interfaces.  If the device doesn't want to support tethering over Wifi this
+          should be empty.  An example would be "softap.*" -->
+   <string-array translatable="false" name="config_tether_wifi_regexs">
+       <item>"wigig0"</item>
+       <item>"softap0"</item>
+   </string-array>
 </resources>
diff --git a/sdm660_64.mk b/sdm660_64.mk
index f8c7a349..f529f489 100644
--- a/sdm660_64.mk
+++ b/sdm660_64.mk
@@ -1,8 +1,6 @@
 TARGET_USES_AOSP := true
 
-ifneq ($(TARGET_USES_AOSP),true)
-  DEVICE_PACKAGE_OVERLAYS := device/qcom/sdm660_64/overlay
-endif
+DEVICE_PACKAGE_OVERLAYS := device/qcom/sdm660_64/overlay
 
 # Default vendor configuration.
 ifeq ($(ENABLE_VENDOR_IMAGE),)