diff --git a/common.mk b/common.mk
index 998f24a..690e751 100644
--- a/common.mk
+++ b/common.mk
@@ -29,10 +29,10 @@ DEVICE_PACKAGE_OVERLAYS += \
 PRODUCT_ENFORCE_RRO_TARGETS := *
 
 PRODUCT_PACKAGES += \
-    FrameworksResCommon_Sys \
-    SystemUIResCommon_Sys \
-    TelephonyResCommon_Sys \
-    WifiResCommon_Sys \
+    FrameworksResCommon \
+    SystemUIResCommon \
+    TelephonyResCommon \
+    WifiResCommon \
     FrameworksResTarget \
     WifiResTarget
 
diff --git a/resource-overlay/common/Frameworks/Android.bp b/resource-overlay/common/Frameworks/Android.bp
index 58f736f..f1f51bb 100644
--- a/resource-overlay/common/Frameworks/Android.bp
+++ b/resource-overlay/common/Frameworks/Android.bp
@@ -4,6 +4,6 @@
 //
 
 runtime_resource_overlay {
-    name: "FrameworksResCommon_Sys",
-    product_specific: true,
+    name: "FrameworksResCommon",
+    vendor: true,
 }
diff --git a/resource-overlay/common/Frameworks/AndroidManifest.xml b/resource-overlay/common/Frameworks/AndroidManifest.xml
index 98514ec..2ae2b1c 100644
--- a/resource-overlay/common/Frameworks/AndroidManifest.xml
+++ b/resource-overlay/common/Frameworks/AndroidManifest.xml
@@ -1,21 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2018 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.
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
 -->
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    coreApp="true"
     package="android.overlay.common">
-    <overlay android:targetPackage="android" android:isStatic="true" android:priority="100" />
+
+    <overlay
+        android:isStatic="true"
+        android:priority="200"
+        android:targetPackage="android" />
 </manifest>
diff --git a/resource-overlay/common/Frameworks/LICENSE b/resource-overlay/common/Frameworks/LICENSE
deleted file mode 100644
index 53f3da5..0000000
--- a/resource-overlay/common/Frameworks/LICENSE
+++ /dev/null
@@ -1,181 +0,0 @@
-This text file is provided to comply with the attribution requirements of
-the licenses herein, but see NOTICE for license terms of this software.
-The Apache 2.0 license can be found at
-http://www.apache.org/licenses/LICENSE-2.0.html
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
diff --git a/resource-overlay/common/Frameworks/NOTICE b/resource-overlay/common/Frameworks/NOTICE
deleted file mode 100644
index 001a9ce..0000000
--- a/resource-overlay/common/Frameworks/NOTICE
+++ /dev/null
@@ -1,74 +0,0 @@
-This NOTICE file contains certain notices of software components included
-with the software that Qualcomm Technologies, Inc. ("Qualcomm Technologies")
-is required to provide you. Notwithstanding anything in the notices in this
-file, your use of these software components together with the
-Qualcomm Technologies software (Qualcomm Technologies software hereinafter
-referred to as "Software") is subject to the terms of your license from
-Qualcomm Technologies. Compliance with all copyright laws and software
-license agreements included in the notice section of this file are the
-responsibility of the user. Except as may be granted by separate express
-written agreement, this file provides no license to any patents,
-trademarks, copyrights, or other intellectual property.
-
-Copyright (c) 2018 Qualcomm Technologies, Inc.
-All rights reserved. 
-Qualcomm is a registered trademark and registered service mark of
-QUALCOMM Incorporated. All other trademarks and service marks are the
-property of their respective owners.
-________________________________________
-NOTICES
-________________________________________
-
-Copyright (c) 2014-2018 The Linux Foundation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted (subject to the limitations in the
-disclaimer below) provided that the following conditions are met:
-
-   * Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-     copyright notice, this list of conditions and the following
-     disclaimer in the documentation and/or other materials provided
-     with the distribution.
-   * Neither the name of the Linux Foundation nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
-NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
-GRANTED BY THIS LICENSE.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
-HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-________________________________________
-
-Copyright (C) 2018 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.
-
-________________________________________
-
-Note: Any files for which the above Apache License notices are required
-to be provided are not contributions. 
-
-A copy of the Apache 2.0 license is included in the file LICENSE
-for attribution purposes only.
diff --git a/resource-overlay/common/Frameworks/res/values-mcc234-mnc15-en-rGB/config.xml b/resource-overlay/common/Frameworks/res/values-mcc234-mnc15-en-rGB/config.xml
index 4629b03..fe04904 100644
--- a/resource-overlay/common/Frameworks/res/values-mcc234-mnc15-en-rGB/config.xml
+++ b/resource-overlay/common/Frameworks/res/values-mcc234-mnc15-en-rGB/config.xml
@@ -1,53 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- National Language Identifier codes for the following two config items.
-          0  - reserved
-          1  - Turkish
-          2  - Spanish (single shift table only)
-          3  - Portuguese
-          4  - Bengali
-          5  - Gujarati
-          6  - Hindi
-          7  - Kannada
-          8  - Malayalam
-          9  - Oriya
-         10  - Punjabi
-         11  - Tamil
-         12  - Telugu
-         13  - Urdu
-         14+ - reserved -->
-
     <!-- National language single shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 to conform with
+           By-Law Number 27230. (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
          Example 2: devices sold in India should include tables 4 through 13
            to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_single_shift_tables">
@@ -67,8 +29,13 @@
     </integer-array>
 
     <!-- National language locking shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 after the
+           Turkish Telecommunication Authority requires locking shift encoding
+           to be enabled (est. July 2012). (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+           See also: http://www.mobitech.com.tr/tr/ersanozturkblog_en/index.php?entry=entry090223-160014
          Example 2: devices sold in India should include tables 4 through 13
          to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_locking_shift_tables">
diff --git a/resource-overlay/common/Frameworks/res/values-mcc234-mnc15-en-rIN/config.xml b/resource-overlay/common/Frameworks/res/values-mcc234-mnc15-en-rIN/config.xml
index 4629b03..fe04904 100644
--- a/resource-overlay/common/Frameworks/res/values-mcc234-mnc15-en-rIN/config.xml
+++ b/resource-overlay/common/Frameworks/res/values-mcc234-mnc15-en-rIN/config.xml
@@ -1,53 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- National Language Identifier codes for the following two config items.
-          0  - reserved
-          1  - Turkish
-          2  - Spanish (single shift table only)
-          3  - Portuguese
-          4  - Bengali
-          5  - Gujarati
-          6  - Hindi
-          7  - Kannada
-          8  - Malayalam
-          9  - Oriya
-         10  - Punjabi
-         11  - Tamil
-         12  - Telugu
-         13  - Urdu
-         14+ - reserved -->
-
     <!-- National language single shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 to conform with
+           By-Law Number 27230. (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
          Example 2: devices sold in India should include tables 4 through 13
            to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_single_shift_tables">
@@ -67,8 +29,13 @@
     </integer-array>
 
     <!-- National language locking shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 after the
+           Turkish Telecommunication Authority requires locking shift encoding
+           to be enabled (est. July 2012). (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+           See also: http://www.mobitech.com.tr/tr/ersanozturkblog_en/index.php?entry=entry090223-160014
          Example 2: devices sold in India should include tables 4 through 13
          to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_locking_shift_tables">
diff --git a/resource-overlay/common/Frameworks/res/values-mcc234-mnc15/config.xml b/resource-overlay/common/Frameworks/res/values-mcc234-mnc15/config.xml
index 4629b03..fe04904 100644
--- a/resource-overlay/common/Frameworks/res/values-mcc234-mnc15/config.xml
+++ b/resource-overlay/common/Frameworks/res/values-mcc234-mnc15/config.xml
@@ -1,53 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- National Language Identifier codes for the following two config items.
-          0  - reserved
-          1  - Turkish
-          2  - Spanish (single shift table only)
-          3  - Portuguese
-          4  - Bengali
-          5  - Gujarati
-          6  - Hindi
-          7  - Kannada
-          8  - Malayalam
-          9  - Oriya
-         10  - Punjabi
-         11  - Tamil
-         12  - Telugu
-         13  - Urdu
-         14+ - reserved -->
-
     <!-- National language single shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 to conform with
+           By-Law Number 27230. (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
          Example 2: devices sold in India should include tables 4 through 13
            to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_single_shift_tables">
@@ -67,8 +29,13 @@
     </integer-array>
 
     <!-- National language locking shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 after the
+           Turkish Telecommunication Authority requires locking shift encoding
+           to be enabled (est. July 2012). (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+           See also: http://www.mobitech.com.tr/tr/ersanozturkblog_en/index.php?entry=entry090223-160014
          Example 2: devices sold in India should include tables 4 through 13
          to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_locking_shift_tables">
diff --git a/resource-overlay/common/Frameworks/res/values-mcc262-mnc02-en-rGB/config.xml b/resource-overlay/common/Frameworks/res/values-mcc262-mnc02-en-rGB/config.xml
index 4629b03..fe04904 100644
--- a/resource-overlay/common/Frameworks/res/values-mcc262-mnc02-en-rGB/config.xml
+++ b/resource-overlay/common/Frameworks/res/values-mcc262-mnc02-en-rGB/config.xml
@@ -1,53 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- National Language Identifier codes for the following two config items.
-          0  - reserved
-          1  - Turkish
-          2  - Spanish (single shift table only)
-          3  - Portuguese
-          4  - Bengali
-          5  - Gujarati
-          6  - Hindi
-          7  - Kannada
-          8  - Malayalam
-          9  - Oriya
-         10  - Punjabi
-         11  - Tamil
-         12  - Telugu
-         13  - Urdu
-         14+ - reserved -->
-
     <!-- National language single shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 to conform with
+           By-Law Number 27230. (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
          Example 2: devices sold in India should include tables 4 through 13
            to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_single_shift_tables">
@@ -67,8 +29,13 @@
     </integer-array>
 
     <!-- National language locking shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 after the
+           Turkish Telecommunication Authority requires locking shift encoding
+           to be enabled (est. July 2012). (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+           See also: http://www.mobitech.com.tr/tr/ersanozturkblog_en/index.php?entry=entry090223-160014
          Example 2: devices sold in India should include tables 4 through 13
          to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_locking_shift_tables">
diff --git a/resource-overlay/common/Frameworks/res/values-mcc262-mnc02-en-rIN/config.xml b/resource-overlay/common/Frameworks/res/values-mcc262-mnc02-en-rIN/config.xml
index 4629b03..fe04904 100644
--- a/resource-overlay/common/Frameworks/res/values-mcc262-mnc02-en-rIN/config.xml
+++ b/resource-overlay/common/Frameworks/res/values-mcc262-mnc02-en-rIN/config.xml
@@ -1,53 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- National Language Identifier codes for the following two config items.
-          0  - reserved
-          1  - Turkish
-          2  - Spanish (single shift table only)
-          3  - Portuguese
-          4  - Bengali
-          5  - Gujarati
-          6  - Hindi
-          7  - Kannada
-          8  - Malayalam
-          9  - Oriya
-         10  - Punjabi
-         11  - Tamil
-         12  - Telugu
-         13  - Urdu
-         14+ - reserved -->
-
     <!-- National language single shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 to conform with
+           By-Law Number 27230. (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
          Example 2: devices sold in India should include tables 4 through 13
            to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_single_shift_tables">
@@ -67,8 +29,13 @@
     </integer-array>
 
     <!-- National language locking shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 after the
+           Turkish Telecommunication Authority requires locking shift encoding
+           to be enabled (est. July 2012). (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+           See also: http://www.mobitech.com.tr/tr/ersanozturkblog_en/index.php?entry=entry090223-160014
          Example 2: devices sold in India should include tables 4 through 13
          to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_locking_shift_tables">
diff --git a/resource-overlay/common/Frameworks/res/values-mcc262-mnc02/config.xml b/resource-overlay/common/Frameworks/res/values-mcc262-mnc02/config.xml
index 4629b03..fe04904 100644
--- a/resource-overlay/common/Frameworks/res/values-mcc262-mnc02/config.xml
+++ b/resource-overlay/common/Frameworks/res/values-mcc262-mnc02/config.xml
@@ -1,53 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- National Language Identifier codes for the following two config items.
-          0  - reserved
-          1  - Turkish
-          2  - Spanish (single shift table only)
-          3  - Portuguese
-          4  - Bengali
-          5  - Gujarati
-          6  - Hindi
-          7  - Kannada
-          8  - Malayalam
-          9  - Oriya
-         10  - Punjabi
-         11  - Tamil
-         12  - Telugu
-         13  - Urdu
-         14+ - reserved -->
-
     <!-- National language single shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 to conform with
+           By-Law Number 27230. (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
          Example 2: devices sold in India should include tables 4 through 13
            to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_single_shift_tables">
@@ -67,8 +29,13 @@
     </integer-array>
 
     <!-- National language locking shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 after the
+           Turkish Telecommunication Authority requires locking shift encoding
+           to be enabled (est. July 2012). (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+           See also: http://www.mobitech.com.tr/tr/ersanozturkblog_en/index.php?entry=entry090223-160014
          Example 2: devices sold in India should include tables 4 through 13
          to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_locking_shift_tables">
diff --git a/resource-overlay/common/Frameworks/res/values-mcc262-mnc04-en-rGB/config.xml b/resource-overlay/common/Frameworks/res/values-mcc262-mnc04-en-rGB/config.xml
index 4629b03..fe04904 100644
--- a/resource-overlay/common/Frameworks/res/values-mcc262-mnc04-en-rGB/config.xml
+++ b/resource-overlay/common/Frameworks/res/values-mcc262-mnc04-en-rGB/config.xml
@@ -1,53 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- National Language Identifier codes for the following two config items.
-          0  - reserved
-          1  - Turkish
-          2  - Spanish (single shift table only)
-          3  - Portuguese
-          4  - Bengali
-          5  - Gujarati
-          6  - Hindi
-          7  - Kannada
-          8  - Malayalam
-          9  - Oriya
-         10  - Punjabi
-         11  - Tamil
-         12  - Telugu
-         13  - Urdu
-         14+ - reserved -->
-
     <!-- National language single shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 to conform with
+           By-Law Number 27230. (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
          Example 2: devices sold in India should include tables 4 through 13
            to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_single_shift_tables">
@@ -67,8 +29,13 @@
     </integer-array>
 
     <!-- National language locking shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 after the
+           Turkish Telecommunication Authority requires locking shift encoding
+           to be enabled (est. July 2012). (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+           See also: http://www.mobitech.com.tr/tr/ersanozturkblog_en/index.php?entry=entry090223-160014
          Example 2: devices sold in India should include tables 4 through 13
          to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_locking_shift_tables">
diff --git a/resource-overlay/common/Frameworks/res/values-mcc262-mnc04-en-rIN/config.xml b/resource-overlay/common/Frameworks/res/values-mcc262-mnc04-en-rIN/config.xml
index 4629b03..fe04904 100644
--- a/resource-overlay/common/Frameworks/res/values-mcc262-mnc04-en-rIN/config.xml
+++ b/resource-overlay/common/Frameworks/res/values-mcc262-mnc04-en-rIN/config.xml
@@ -1,53 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- National Language Identifier codes for the following two config items.
-          0  - reserved
-          1  - Turkish
-          2  - Spanish (single shift table only)
-          3  - Portuguese
-          4  - Bengali
-          5  - Gujarati
-          6  - Hindi
-          7  - Kannada
-          8  - Malayalam
-          9  - Oriya
-         10  - Punjabi
-         11  - Tamil
-         12  - Telugu
-         13  - Urdu
-         14+ - reserved -->
-
     <!-- National language single shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 to conform with
+           By-Law Number 27230. (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
          Example 2: devices sold in India should include tables 4 through 13
            to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_single_shift_tables">
@@ -67,8 +29,13 @@
     </integer-array>
 
     <!-- National language locking shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 after the
+           Turkish Telecommunication Authority requires locking shift encoding
+           to be enabled (est. July 2012). (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+           See also: http://www.mobitech.com.tr/tr/ersanozturkblog_en/index.php?entry=entry090223-160014
          Example 2: devices sold in India should include tables 4 through 13
          to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_locking_shift_tables">
diff --git a/resource-overlay/common/Frameworks/res/values-mcc262-mnc04/config.xml b/resource-overlay/common/Frameworks/res/values-mcc262-mnc04/config.xml
index 4629b03..fe04904 100644
--- a/resource-overlay/common/Frameworks/res/values-mcc262-mnc04/config.xml
+++ b/resource-overlay/common/Frameworks/res/values-mcc262-mnc04/config.xml
@@ -1,53 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- National Language Identifier codes for the following two config items.
-          0  - reserved
-          1  - Turkish
-          2  - Spanish (single shift table only)
-          3  - Portuguese
-          4  - Bengali
-          5  - Gujarati
-          6  - Hindi
-          7  - Kannada
-          8  - Malayalam
-          9  - Oriya
-         10  - Punjabi
-         11  - Tamil
-         12  - Telugu
-         13  - Urdu
-         14+ - reserved -->
-
     <!-- National language single shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 to conform with
+           By-Law Number 27230. (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
          Example 2: devices sold in India should include tables 4 through 13
            to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_single_shift_tables">
@@ -67,8 +29,13 @@
     </integer-array>
 
     <!-- National language locking shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 after the
+           Turkish Telecommunication Authority requires locking shift encoding
+           to be enabled (est. July 2012). (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+           See also: http://www.mobitech.com.tr/tr/ersanozturkblog_en/index.php?entry=entry090223-160014
          Example 2: devices sold in India should include tables 4 through 13
          to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_locking_shift_tables">
diff --git a/resource-overlay/common/Frameworks/res/values-mcc262-mnc09-en-rGB/config.xml b/resource-overlay/common/Frameworks/res/values-mcc262-mnc09-en-rGB/config.xml
index 4629b03..fe04904 100644
--- a/resource-overlay/common/Frameworks/res/values-mcc262-mnc09-en-rGB/config.xml
+++ b/resource-overlay/common/Frameworks/res/values-mcc262-mnc09-en-rGB/config.xml
@@ -1,53 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- National Language Identifier codes for the following two config items.
-          0  - reserved
-          1  - Turkish
-          2  - Spanish (single shift table only)
-          3  - Portuguese
-          4  - Bengali
-          5  - Gujarati
-          6  - Hindi
-          7  - Kannada
-          8  - Malayalam
-          9  - Oriya
-         10  - Punjabi
-         11  - Tamil
-         12  - Telugu
-         13  - Urdu
-         14+ - reserved -->
-
     <!-- National language single shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 to conform with
+           By-Law Number 27230. (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
          Example 2: devices sold in India should include tables 4 through 13
            to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_single_shift_tables">
@@ -67,8 +29,13 @@
     </integer-array>
 
     <!-- National language locking shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 after the
+           Turkish Telecommunication Authority requires locking shift encoding
+           to be enabled (est. July 2012). (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+           See also: http://www.mobitech.com.tr/tr/ersanozturkblog_en/index.php?entry=entry090223-160014
          Example 2: devices sold in India should include tables 4 through 13
          to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_locking_shift_tables">
diff --git a/resource-overlay/common/Frameworks/res/values-mcc262-mnc09-en-rIN/config.xml b/resource-overlay/common/Frameworks/res/values-mcc262-mnc09-en-rIN/config.xml
index 4629b03..fe04904 100644
--- a/resource-overlay/common/Frameworks/res/values-mcc262-mnc09-en-rIN/config.xml
+++ b/resource-overlay/common/Frameworks/res/values-mcc262-mnc09-en-rIN/config.xml
@@ -1,53 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- National Language Identifier codes for the following two config items.
-          0  - reserved
-          1  - Turkish
-          2  - Spanish (single shift table only)
-          3  - Portuguese
-          4  - Bengali
-          5  - Gujarati
-          6  - Hindi
-          7  - Kannada
-          8  - Malayalam
-          9  - Oriya
-         10  - Punjabi
-         11  - Tamil
-         12  - Telugu
-         13  - Urdu
-         14+ - reserved -->
-
     <!-- National language single shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 to conform with
+           By-Law Number 27230. (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
          Example 2: devices sold in India should include tables 4 through 13
            to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_single_shift_tables">
@@ -67,8 +29,13 @@
     </integer-array>
 
     <!-- National language locking shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 after the
+           Turkish Telecommunication Authority requires locking shift encoding
+           to be enabled (est. July 2012). (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+           See also: http://www.mobitech.com.tr/tr/ersanozturkblog_en/index.php?entry=entry090223-160014
          Example 2: devices sold in India should include tables 4 through 13
          to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_locking_shift_tables">
diff --git a/resource-overlay/common/Frameworks/res/values-mcc262-mnc09/config.xml b/resource-overlay/common/Frameworks/res/values-mcc262-mnc09/config.xml
index 4629b03..fe04904 100644
--- a/resource-overlay/common/Frameworks/res/values-mcc262-mnc09/config.xml
+++ b/resource-overlay/common/Frameworks/res/values-mcc262-mnc09/config.xml
@@ -1,53 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- National Language Identifier codes for the following two config items.
-          0  - reserved
-          1  - Turkish
-          2  - Spanish (single shift table only)
-          3  - Portuguese
-          4  - Bengali
-          5  - Gujarati
-          6  - Hindi
-          7  - Kannada
-          8  - Malayalam
-          9  - Oriya
-         10  - Punjabi
-         11  - Tamil
-         12  - Telugu
-         13  - Urdu
-         14+ - reserved -->
-
     <!-- National language single shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 to conform with
+           By-Law Number 27230. (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
          Example 2: devices sold in India should include tables 4 through 13
            to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_single_shift_tables">
@@ -67,8 +29,13 @@
     </integer-array>
 
     <!-- National language locking shift tables to enable for SMS encoding.
-         Decoding is always enabled. Array elements are codes from the table above.
-         Example 1: devices sold in Turkey must include table 1.
+         Decoding is always enabled. 3GPP TS 23.038 states that this feature
+         should not be enabled until a formal request is issued by the relevant
+         national regulatory body. Array elements are codes from the table above.
+         Example 1: devices sold in Turkey must include table 1 after the
+           Turkish Telecommunication Authority requires locking shift encoding
+           to be enabled (est. July 2012). (http://www.btk.gov.tr/eng/pdf/2009/BY-LAW_SMS.pdf)
+           See also: http://www.mobitech.com.tr/tr/ersanozturkblog_en/index.php?entry=entry090223-160014
          Example 2: devices sold in India should include tables 4 through 13
          to enable use of the new Release 9 tables for Indic languages. -->
     <integer-array name="config_sms_enabled_locking_shift_tables">
diff --git a/resource-overlay/common/Frameworks/res/values/config.xml b/resource-overlay/common/Frameworks/res/values/config.xml
index 26a8827..95e75f1 100644
--- a/resource-overlay/common/Frameworks/res/values/config.xml
+++ b/resource-overlay/common/Frameworks/res/values/config.xml
@@ -1,81 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2012-2016, The Linux Foundation. All rights reserved
-
-    Not a Contribution.
-
-    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.
+<!--
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
 -->
-
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- This string array should be overridden by the device to present a list of radio
          attributes.  This is used by the connectivity manager to decide which networks can coexist
          based on the hardware -->
     <!-- An Array of "[ConnectivityManager connectionType],
                       [# simultaneous connection types]"  -->
-    <string-array translatable="false" name="radioAttributes">
+    <string-array name="radioAttributes" translatable="false">
         <item>"1,1"</item>
         <item>"0,1"</item>
         <item>"7,1"</item>
     </string-array>
 
-    <!-- If this is true, the screen will come on when you plug/unplug usb/power/whatever. -->
-    <bool name="config_unplugTurnsOnScreen">true</bool>
-
-    <!-- Boolean indicating if restoring network selection should be skipped -->
-    <!-- The restoring is handled by modem if it is true-->
-    <bool translatable="false" name="skip_restoring_network_selection">true</bool>
-
-    <!-- Is the device capable of hot swapping an ICC Card -->
-    <bool name="config_hotswapCapable">true</bool>
-
-    <!-- Set to true if the wifi display supports compositing content stored
-         in gralloc protected buffers.  For this to be true, there must exist
-         a protected hardware path for surface flinger to composite and send
-         protected buffers to the wifi display video encoder.
-
-         If this flag is false, we advise applications not to use protected
-         buffers (if possible) when presenting content to a wifi display because
-         the content may be blanked.
-
-         This flag controls whether the {@link Display#FLAG_SUPPORTS_PROTECTED_BUFFERS}
-         flag is set for wifi displays.
-    -->
-    <bool name="config_wifiDisplaySupportsProtectedBuffers">true</bool>
-
-    <!-- Flag indicating whether the we should enable the automatic brightness in Settings.
+    <!-- Flag indicating whether we should enable the automatic brightness.
          Software implementation will be used if config_hardware_auto_brightness_available is not set -->
     <bool name="config_automatic_brightness_available">true</bool>
 
-    <!-- Flag specifying whether VoLTE, VT and WFC is available on device -->
-    <bool name="config_device_volte_available">true</bool>
-    <bool name="config_device_vt_available">true</bool>
-    <bool name="config_device_wfc_ims_available">true</bool>
+    <!-- If this is true, the screen will come on when you unplug usb/power/whatever. -->
+    <bool name="config_unplugTurnsOnScreen">true</bool>
 
-    <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of
-         carrier provisioning. If false: hard disabled. If true: then depends on carrier
-         provisioning, availability etc -->
-    <bool name="config_carrier_volte_available">true</bool>
+    <!-- Indicate available ColorDisplayManager.COLOR_MODE_xxx. -->
+    <array name="config_availableColorModes">
+        <item>0</item> <!-- COLOR_MODE_NATURAL -->     <!-- This uses colorimetric render intents-->
+        <item>1</item> <!-- COLOR_MODE_BOOSTED -->     <!-- This applies a 10% boost using the PCC-->
+        <item>2</item> <!-- COLOR_MODE_SATURATED -->
+        <item>3</item> <!-- COLOR_MODE_AUTOMATIC -->   <!-- This uses enhanced render intents-->
+    </array>
 
-    <!-- Config determines whether to update phone object when voice registration
-    state changes. Voice radio tech change will always trigger an update of
-    phone object irrespective of this config -->
-    <bool name="config_switch_phone_on_voice_reg_state_change">false</bool>
+    <!-- Indicate whether to allow the device to suspend when the screen is off
+         due to the proximity sensor.  This resource should only be set to true
+         if the sensor HAL correctly handles the proximity sensor as a wake-up source.
+         Otherwise, the device may fail to wake out of suspend reliably.
+         The default is false. -->
+    <bool name="config_suspendWhenScreenOffDueToProximity">true</bool>
 
-    <!-- Whether the Unprocessed audio source supports the required frequency range and level -->
-    <bool name="config_supportAudioSourceUnprocessed">true</bool>
+    <!-- Is the device capable of hot swapping an UICC Card -->
+    <bool name="config_hotswapCapable">true</bool>
+
+    <!-- Screen brightness used to dim the screen while dozing in a very low power state.
+         May be less than the minimum allowed brightness setting
+         that can be set by the user. -->
+    <integer name="config_screenBrightnessDoze">17</integer>
+
+    <!-- The restoring is handled by modem if it is true-->
+    <bool name="skip_restoring_network_selection">true</bool>
 
     <!-- Whether a software navigation bar should be shown. NOTE: in the future this may be
-        autodetected from the Configuration. -->
+         autodetected from the Configuration. -->
     <bool name="config_showNavigationBar">true</bool>
 
     <!-- ComponentName of a dream to show whenever the system would otherwise have
@@ -84,43 +58,15 @@
          to put the display into a low power state and allow the application processor
          to be suspended.  When the dream ends, the system will go to sleep as usual.
          Specify the component name or an empty string if none.
+
          Note that doze dreams are not subject to the same start conditions as ordinary dreams.
          Doze dreams will run whenever the power manager is in a dozing state. -->
-    <string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
+    <string name="config_dozeComponent" translatable="false">com.android.systemui/com.android.systemui.doze.DozeService</string>
 
     <!-- If true, the doze component is not started until after the screen has been
          turned off and the screen off animation has been performed. -->
     <bool name="config_dozeAfterScreenOffByDefault">true</bool>
 
-    <!-- Screen brightness when dozing. -->
-    <integer name="config_screenBrightnessDoze">17</integer>
-
-    <!-- Power Management: Specifies whether to decouple the interactive state of the
-         device from the display on/off state.
-
-         When false, setInteractive(..., true) will be called before the display is turned on
-         and setInteractive(..., false) will be called after the display is turned off.
-         This mode provides best compatibility for devices that expect the interactive
-         state to be tied to the display state.
-
-         When true, setInteractive(...) will be called independently of whether the display
-         is being turned on or off.  This mode enables the power manager to reduce
-         clocks and disable the touch controller while the display is on.
-
-         This resource should be set to "true" when a doze component has been specified
-         to maximize power savings but not all devices support it.
-
-         Refer to power.h for details.
-    -->
-    <bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
-
-    <!-- Indicate whether to allow the device to suspend when the screen is off
-         due to the proximity sensor.  This resource should only be set to true
-         if the sensor HAL correctly handles the proximity sensor as a wake-up source.
-         Otherwise, the device may fail to wake out of suspend reliably.
-         The default is false. -->
-    <bool name="config_suspendWhenScreenOffDueToProximity">true</bool>
-
     <!-- Power Management: Specifies whether to decouple the auto-suspend state of the
          device from the display on/off state.
 
@@ -141,20 +87,27 @@
     -->
     <bool name="config_powerDecoupleAutoSuspendModeFromDisplay">true</bool>
 
-    <!-- List supported color modes. -->
-    <array name="config_availableColorModes">
-        <item>0</item> <!-- COLOR_MODE_NATURAL -->     <!-- This uses colorimetric render intents-->
-        <item>1</item> <!-- COLOR_MODE_BOOSTED -->     <!-- This applies a 10% boost using the PCC-->
-        <item>2</item> <!-- COLOR_MODE_SATURATED -->
-        <item>3</item> <!-- COLOR_MODE_AUTOMATIC -->   <!-- This uses enhanced render intents-->
-    </array>
+    <!-- Power Management: Specifies whether to decouple the interactive state of the
+         device from the display on/off state.
 
-    <!-- Whether to select voice/data/sms preference without user confirmation -->
-    <bool name="config_voice_data_sms_auto_fallback">true</bool>
+         When false, setInteractive(..., true) will be called before the display is turned on
+         and setInteractive(..., false) will be called after the display is turned off.
+         This mode provides best compatibility for devices that expect the interactive
+         state to be tied to the display state.
 
-    <!-- set to false if we need to show user confirmation
-         when alpha identifier is not provided by the UICC -->
-    <bool name="config_stkNoAlphaUsrCnf">false</bool>
+         When true, setInteractive(...) will be called independently of whether the display
+         is being turned on or off.  This mode enables the power manager to reduce
+         clocks and disable the touch controller while the display is on.
+
+         This resource should be set to "true" when a doze component has been specified
+         to maximize power savings but not all devices support it.
+
+         Refer to power.h for details.
+    -->
+    <bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
+
+    <!-- Whether the new Auto Selection Network UI should be shown -->
+    <bool name="config_enableNewAutoSelectNetworkUI">true</bool>
 
     <!-- Whether WiFi display is supported by this device.
          There are many prerequisites for this feature to work correctly.
@@ -170,15 +123,55 @@
     -->
     <bool name="config_enableWifiDisplay">true</bool>
 
-    <!-- True if the device supports Sustained Performance Mode -->
-    <bool name="config_sustainedPerformanceModeSupported">true</bool>
+    <!-- Set to true if the wifi display supports compositing content stored
+         in gralloc protected buffers.  For this to be true, there must exist
+         a protected hardware path for surface flinger to composite and send
+         protected buffers to the wifi display video encoder.
 
-    <!-- Whether the new Auto Selection Network UI should be shown -->
-    <bool name="config_enableNewAutoSelectNetworkUI">true</bool>
+         If this flag is false, we advise applications not to use protected
+         buffers (if possible) when presenting content to a wifi display because
+         the content may be blanked.
+
+         This flag controls whether the {@link Display#FLAG_SUPPORTS_PROTECTED_BUFFERS}
+         flag is set for wifi displays.
+    -->
+    <bool name="config_wifiDisplaySupportsProtectedBuffers">true</bool>
+
+    <!-- set to false if we need to show user confirmation
+         when alpha identifier is not provided by the UICC -->
+    <bool name="config_stkNoAlphaUsrCnf">false</bool>
+
+    <!-- Flag specifying whether VoLTE is available on device -->
+    <bool name="config_device_volte_available">true</bool>
+
+    <!-- Flag specifying whether VoLTE should be available for carrier: independent of
+         carrier provisioning. If false: hard disabled. If true: then depends on carrier
+         provisioning, availability etc -->
+    <bool name="config_carrier_volte_available">true</bool>
+
+    <!-- Flag specifying whether VT is available on device -->
+    <bool name="config_device_vt_available">true</bool>
+
+    <!-- Flag specifying whether WFC over IMS is available on device -->
+    <bool name="config_device_wfc_ims_available">true</bool>
+
+    <!-- Config determines whether to update phone object when voice registration
+         state changes. Voice radio tech change will always trigger an update of
+         phone object irrespective of this config -->
+    <bool name="config_switch_phone_on_voice_reg_state_change">false</bool>
+
+    <!-- Whether the Unprocessed audio source supports the required frequency range and level -->
+    <bool name="config_supportAudioSourceUnprocessed">true</bool>
+
+    <!-- True if the device supports Sustained Performance Mode-->
+    <bool name="config_sustainedPerformanceModeSupported">true</bool>
 
     <!-- Whether the device enable the standalone (SA) mode of 5G NR.-->
     <bool name="config_telephony5gStandalone">true</bool>
 
     <!-- Whether the device enable the non-standalone (NSA) mode of 5G NR.-->
     <bool name="config_telephony5gNonStandalone">true</bool>
+
+    <!-- Whether to select voice/data/sms preference without user confirmation -->
+    <bool name="config_voice_data_sms_auto_fallback">true</bool>
 </resources>
diff --git a/resource-overlay/common/SystemUI/Android.bp b/resource-overlay/common/SystemUI/Android.bp
index f92a948..74b6651 100644
--- a/resource-overlay/common/SystemUI/Android.bp
+++ b/resource-overlay/common/SystemUI/Android.bp
@@ -4,6 +4,6 @@
 //
 
 runtime_resource_overlay {
-    name: "SystemUIResCommon_Sys",
-    product_specific: true,
+    name: "SystemUIResCommon",
+    vendor: true,
 }
diff --git a/resource-overlay/common/SystemUI/AndroidManifest.xml b/resource-overlay/common/SystemUI/AndroidManifest.xml
index ff46adf..7a25291 100644
--- a/resource-overlay/common/SystemUI/AndroidManifest.xml
+++ b/resource-overlay/common/SystemUI/AndroidManifest.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2018, Qualcomm Technologies, Inc.
-    All Rights Reserved.
+<!--
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    coreApp="true"
     package="com.android.systemui.overlay.common">
-    <overlay android:targetPackage="com.android.systemui" android:isStatic="true" />
+
+    <overlay
+        android:isStatic="true"
+        android:priority="200"
+        android:targetPackage="com.android.systemui" />
 </manifest>
diff --git a/resource-overlay/common/SystemUI/NOTICE b/resource-overlay/common/SystemUI/NOTICE
deleted file mode 100644
index 092b509..0000000
--- a/resource-overlay/common/SystemUI/NOTICE
+++ /dev/null
@@ -1,50 +0,0 @@
-This NOTICE file contains certain notices of software components included
-with the software that Qualcomm Technologies, Inc. ("Qualcomm Technologies")
-is required to provide you. Notwithstanding anything in the notices in this
-file, your use of these software components together with the
-Qualcomm Technologies software (Qualcomm Technologies software hereinafter
-referred to as "Software") is subject to the terms of your license from
-Qualcomm Technologies. Compliance with all copyright laws and software
-license agreements included in the notice section of this file are the
-responsibility of the user. Except as may be granted by separate express
-written agreement, this file provides no license to any patents,
-trademarks, copyrights, or other intellectual property.
-
-Copyright (c) 2018 Qualcomm Technologies, Inc.
-All rights reserved. 
-Qualcomm is a registered trademark and registered service mark of
-QUALCOMM Incorporated. All other trademarks and service marks are the
-property of their respective owners.
-________________________________________
-NOTICES
-________________________________________
-
-Copyright (c) 2014-2018 The Linux Foundation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted (subject to the limitations in the
-disclaimer below) provided that the following conditions are met:
-
-   * Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-     copyright notice, this list of conditions and the following
-     disclaimer in the documentation and/or other materials provided
-     with the distribution.
-   * Neither the name of the Linux Foundation nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
-NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
-GRANTED BY THIS LICENSE.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
-HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/resource-overlay/common/SystemUI/res/values/config.xml b/resource-overlay/common/SystemUI/res/values/config.xml
index cdf84fa..0796541 100644
--- a/resource-overlay/common/SystemUI/res/values/config.xml
+++ b/resource-overlay/common/SystemUI/res/values/config.xml
@@ -1,36 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-
-Copyright (c) 2014, The Linux Foundation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
 -->
-<resources>
-    <!-- Enable doze mode -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Doze: does this device support STATE_DOZE?  -->
     <bool name="doze_display_state_supported">false</bool>
 
     <!-- Whether to show a warning notification when device's skin temperature is high. -->
diff --git a/resource-overlay/common/Telephony/Android.bp b/resource-overlay/common/Telephony/Android.bp
index 4edf1a0..33e6e09 100644
--- a/resource-overlay/common/Telephony/Android.bp
+++ b/resource-overlay/common/Telephony/Android.bp
@@ -4,6 +4,6 @@
 //
 
 runtime_resource_overlay {
-    name: "TelephonyResCommon_Sys",
-    product_specific: true,
+    name: "TelephonyResCommon",
+    vendor: true,
 }
diff --git a/resource-overlay/common/Telephony/AndroidManifest.xml b/resource-overlay/common/Telephony/AndroidManifest.xml
index 7ef1e0f..efefe77 100644
--- a/resource-overlay/common/Telephony/AndroidManifest.xml
+++ b/resource-overlay/common/Telephony/AndroidManifest.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2018, Qualcomm Technologies, Inc.
-    All Rights Reserved.
+<!--
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    coreApp="true"
     package="com.android.phone.overlay.common">
-    <overlay android:targetPackage="com.android.phone" android:isStatic="true" />
+
+    <overlay
+        android:isStatic="true"
+        android:priority="200"
+        android:targetPackage="com.android.phone" />
 </manifest>
diff --git a/resource-overlay/common/Telephony/LICENSE b/resource-overlay/common/Telephony/LICENSE
deleted file mode 100644
index 53f3da5..0000000
--- a/resource-overlay/common/Telephony/LICENSE
+++ /dev/null
@@ -1,181 +0,0 @@
-This text file is provided to comply with the attribution requirements of
-the licenses herein, but see NOTICE for license terms of this software.
-The Apache 2.0 license can be found at
-http://www.apache.org/licenses/LICENSE-2.0.html
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
diff --git a/resource-overlay/common/Telephony/NOTICE b/resource-overlay/common/Telephony/NOTICE
deleted file mode 100644
index 6477739..0000000
--- a/resource-overlay/common/Telephony/NOTICE
+++ /dev/null
@@ -1,109 +0,0 @@
-This NOTICE file contains certain notices of software components included
-with the software that Qualcomm Technologies, Inc. ("Qualcomm Technologies")
-is required to provide you. Notwithstanding anything in the notices in this
-file, your use of these software components together with the
-Qualcomm Technologies software (Qualcomm Technologies software hereinafter
-referred to as "Software") is subject to the terms of your license from
-Qualcomm Technologies. Compliance with all copyright laws and software
-license agreements included in the notice section of this file are the
-responsibility of the user. Except as may be granted by separate express
-written agreement, this file provides no license to any patents,
-trademarks, copyrights, or other intellectual property.
-
-Copyright (c) 2018, 2019 Qualcomm Technologies, Inc.
-All rights reserved. 
-Qualcomm is a registered trademark and registered service mark of
-QUALCOMM Incorporated. All other trademarks and service marks are the
-property of their respective owners.
-________________________________________
-NOTICES
-________________________________________
-
-Copyright (c) 2012, The Linux Foundation. All rights reserved.
-
-Not a Contribution, Apache license notifications and license are retained
-for attribution purposes only.
-    
-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.
-
-________________________________________
-
-Copyright (c) 2012-2016, The Linux Foundation. All rights reserved
-
-Not a Contribution.
-
-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.
-
-________________________________________
-
-Copyright (c) 2013-2018 The Linux Foundation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted (subject to the limitations in the
-disclaimer below) provided that the following conditions are met:
-
-   * Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-     copyright notice, this list of conditions and the following
-     disclaimer in the documentation and/or other materials provided
-     with the distribution.
-   * Neither the name of the Linux Foundation nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
-NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
-GRANTED BY THIS LICENSE.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
-HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-________________________________________
-
-Copyright (C) 2018 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.
-________________________________________
-
-Note: Any files for which the above Apache License notices are required
-to be provided are not contributions.
-
-A copy of the Apache 2.0 license is included in the file LICENSE
-for attribution purposes only.
diff --git a/resource-overlay/common/Telephony/res/values/config.xml b/resource-overlay/common/Telephony/res/values/config.xml
index 5fbd4fa..d82a9f1 100644
--- a/resource-overlay/common/Telephony/res/values/config.xml
+++ b/resource-overlay/common/Telephony/res/values/config.xml
@@ -1,32 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2013, The Linux Foundation. All rights reserved.
-
-    Not a Contribution, Apache license notifications and license are retained
-    for attribution purposes only.
-
-    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. -->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Show RTT option in Accessibility menu -->
+<!--
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Flag indicating whether the device supports RTT (real-time text) -->
     <bool name="config_support_rtt">true</bool>
 
-    <!-- String indicating the package name of the device ImsService implementation for MMTEL -->
-    <string name="config_ims_mmtel_package">org.codeaurora.ims</string>
+    <!-- String indicating the package name of the device ImsService implementation for MMTEL. -->
+    <string name="config_ims_mmtel_package" translatable="false">org.codeaurora.ims</string>
 
-    <!-- String indicating the package name of the device ImsService implementation for RCS -->
-    <string name="config_ims_rcs_package">vendor.qti.imsrcs</string>
+    <!-- String indicating the package name of the device ImsService implementation for RCS. -->
+    <string name="config_ims_rcs_package" translatable="false">vendor.qti.imsrcs</string>
 
     <!-- String indicating the package name of the device GbaService implementation. -->
     <string name="config_gba_package" translatable="false">com.qualcomm.qti.uimGbaApp</string>
diff --git a/resource-overlay/common/Wifi/Android.bp b/resource-overlay/common/Wifi/Android.bp
index 0bee207..af670f7 100644
--- a/resource-overlay/common/Wifi/Android.bp
+++ b/resource-overlay/common/Wifi/Android.bp
@@ -4,6 +4,6 @@
 //
 
 runtime_resource_overlay {
-    name: "WifiResCommon_Sys",
-    product_specific: true,
+    name: "WifiResCommon",
+    vendor: true,
 }
diff --git a/resource-overlay/common/Wifi/AndroidManifest.xml b/resource-overlay/common/Wifi/AndroidManifest.xml
index 04df4cb..f8adddb 100644
--- a/resource-overlay/common/Wifi/AndroidManifest.xml
+++ b/resource-overlay/common/Wifi/AndroidManifest.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2020, Qualcomm Technologies, Inc.
-    All Rights Reserved.
+<!--
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    coreApp="true"
     package="com.android.wifi.resources.overlay.common">
-    <overlay android:targetPackage="com.android.wifi.resources" android:targetName = "WifiCustomization" android:isStatic="true" />
+
+    <overlay
+        android:isStatic="true"
+        android:priority="200"
+        android:targetName="WifiCustomization"
+        android:targetPackage="com.android.wifi.resources" />
 </manifest>
diff --git a/resource-overlay/common/Wifi/NOTICE b/resource-overlay/common/Wifi/NOTICE
deleted file mode 100644
index d3694a5..0000000
--- a/resource-overlay/common/Wifi/NOTICE
+++ /dev/null
@@ -1,35 +0,0 @@
-No Title
-This NOTICE file contains certain notices of software components included
-with the software that Qualcomm Technologies, Inc. ("Qualcomm Technologies")
-is required to provide you. Notwithstanding anything in the notices in this
-file, your use of these software components together with the
-Qualcomm Technologies software (Qualcomm Technologies software hereinafter
-referred to as "Software") is subject to the terms of your license from
-Qualcomm Technologies. Compliance with all copyright laws and software
-license agreements included in the notice section of this file are the
-responsibility of the user. Except as may be granted by separate express
-written agreement, this file provides no license to any patents,
-trademarks, copyrights, or other intellectual property.
-
-Copyright (c) 2020 Qualcomm Technologies, Inc.
-All rights reserved. 
-Qualcomm is a registered trademark and registered service mark of
-QUALCOMM Incorporated. All other trademarks and service marks are the property of their respective owners.
-
-============================================================
-
-/*
- * Copyright (C) 2019 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.
- */
diff --git a/resource-overlay/common/Wifi/res/values/config.xml b/resource-overlay/common/Wifi/res/values/config.xml
index cbce02d..2118f26 100644
--- a/resource-overlay/common/Wifi/res/values/config.xml
+++ b/resource-overlay/common/Wifi/res/values/config.xml
@@ -1,59 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2020 Qualcomm Technologies, Inc.
-     All Rights Reserved.
+<!--
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
 -->
-
-<resources>
-
-    <!-- Boolean indicating whether the wifi chipset has 5GHz frequency band support -->
-    <bool translatable="false" name="config_wifi5ghzSupport">true</bool>
-
-    <!-- Wifi driver supports 6GHz band for softap -->
-    <bool translatable="false" name="config_wifiSoftap6ghzSupported">true</bool>
-
-    <!-- Boolean indicating whether the wifi chipset has background scan support -->
-    <bool translatable="false" name="config_wifi_background_scan_support">true</bool>
-
-   <!-- Enable ACS (auto channel selection) for Wifi hotspot (SAP) -->
-   <bool translatable="false" name="config_wifi_softap_acs_supported">true</bool>
-
-   <!-- Enable 802.11ac for Wifi hotspot (SAP) -->
-   <bool translatable="false" name="config_wifi_softap_ieee80211ac_supported">true</bool>
-
-   <!-- Indicates that connected MAC randomization is supported on this device -->
-   <bool translatable="false" name="config_wifi_connected_mac_randomization_supported">true</bool>
-
-    <!-- Indicates that p2p MAC randomization is supported on this device -->
-    <bool translatable="false" name="config_wifi_p2p_mac_randomization_supported">true</bool>
-
-    <!-- Wifi driver supports WPA3 Simultaneous Authentication of Equals (WPA3-SAE) for softap -->
-    <bool name="config_wifi_softap_sae_supported">true</bool>
-
-    <!-- Wifi driver Automatic channel selection (ACS) for softap to include DFS channels -->
-    <bool translatable="false" name="config_wifiSoftapAcsIncludeDfs">true</bool>
-
-    <!-- Integer indicating maximum hardware supported client number of soft ap -->
-    <integer translatable="false" name="config_wifiHardwareSoftapMaxClientCount">32</integer>
-
-    <!-- Boolean indicating that wifi only link configuratios that have exact same credentials (i.e PSK) -->
-    <bool translatable="false" name="config_wifi_only_link_same_credential_configurations">false</bool>
-
-    <!-- Boolean indicating that multiple NDPs are allowed on single NDI.
-     Enable Aware NDP interface selection on interface that already has network set up.
-     -->
-    <bool translatable="false" name="config_wifiAllowMultipleNetworksOnSameAwareNdi">true</bool>
-
-    <!-- integer indicating additional disconnect delay (in ms) after IMS onLost() indication is received -->
-    <integer translatable="false" name="config_wifiDelayDisconnectOnImsLostMs">1000</integer>
-
-    <!-- Boolean indicating whether 802.11r Fast BSS Transition is enabled on this platform -->
-    <bool name="config_wifi_fast_bss_transition_enabled">true</bool>
-
-    <!-- Enable concurrent restricted connectivity + internet connectivity
-         Note: this is conditional on the device supporting dual concurrent STAs. -->
-    <bool translatable="false" name="config_wifiMultiStaRestrictedConcurrencyEnabled">true</bool>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- boolean indicating whether the WiFi chipset has 5GHz band support.
+         Note: This config is replacing the config_wifi_dual_band_support
+         since more bands may now be supported (such as 6GHz), the naming dual_band
+         is no longer indicative, and a separate config now exists for each band -->
+    <bool name="config_wifi5ghzSupport">true</bool>
 
     <!-- boolean indicating whether the WiFi chipset has 6GHz band support -->
     <bool name="config_wifi6ghzSupport">true</bool>
 
+    <!-- Boolean indicating whether 802.11r Fast BSS Transition is enabled on this platform -->
+    <bool name="config_wifi_fast_bss_transition_enabled">true</bool>
+
+    <!-- Boolean indicating whether the wifi chipset supports background scanning mechanism.
+         This mechanism allows the host to remain in suspend state and the dongle to actively
+         scan and wake the host when a configured SSID is detected by the dongle. This chipset
+         capability can provide power savings when wifi needs to be always kept on. -->
+    <bool name="config_wifi_background_scan_support">true</bool>
+
+    <!-- Integer indicating maximum hardware supported client number of soft ap -->
+    <integer name="config_wifiHardwareSoftapMaxClientCount">32</integer>
+
+    <!-- Boolean indicating that only configurations that have the same pre-shared key will be linked -->
+    <bool name="config_wifi_only_link_same_credential_configurations">false</bool>
+
+    <!-- Wifi driver supports Automatic channel selection (ACS) for softap -->
+    <bool name="config_wifi_softap_acs_supported">true</bool>
+
+    <!-- Wifi driver supports WPA3 Simultaneous Authentication of Equals (WPA3-SAE) for softap -->
+    <bool name="config_wifi_softap_sae_supported">true</bool>
+
+    <!-- Wifi driver supports IEEE80211AC for softap -->
+    <bool name="config_wifi_softap_ieee80211ac_supported">true</bool>
+
+    <!-- Wifi driver supports 6GHz band for softap when chip support 6GHz -->
+    <bool name="config_wifiSoftap6ghzSupported">true</bool>
+
+    <!-- Indicates that connected MAC randomization is supported on this device -->
+    <bool name="config_wifi_connected_mac_randomization_supported">true</bool>
+
+    <!-- Indicates that p2p MAC randomization is supported on this device -->
+    <bool name="config_wifi_p2p_mac_randomization_supported">true</bool>
+
+    <!-- Wifi driver Automatic channel selection (ACS) for softap to include DFS channels -->
+    <bool name="config_wifiSoftapAcsIncludeDfs">true</bool>
+
+    <!-- integer indicating additional disconnect delay (in ms) after IMS onLost() indication is received -->
+    <integer name="config_wifiDelayDisconnectOnImsLostMs">1000</integer>
+
+    <!-- Enable concurrent restricted connectivity + internet connectivity
+         Note: this is conditional on the device supporting dual concurrent STAs. -->
+    <bool name="config_wifiMultiStaRestrictedConcurrencyEnabled">true</bool>
+
+    <!-- Enable Aware NDP interface selection on interface that already has network set up.
+     Note: the default AOSP Android does not support multiple networks on the same Aware NDI.
+     Enabling this configuration will restore legacy behavior but may result in incorrect behavior.
+     -->
+    <bool name="config_wifiAllowMultipleNetworksOnSameAwareNdi">true</bool>
 </resources>
diff --git a/resource-overlay/lahaina/Frameworks/AndroidManifest.xml b/resource-overlay/lahaina/Frameworks/AndroidManifest.xml
index ea9c062..40191f8 100644
--- a/resource-overlay/lahaina/Frameworks/AndroidManifest.xml
+++ b/resource-overlay/lahaina/Frameworks/AndroidManifest.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2019, Qualcomm Technologies, Inc.
-    All Rights Reserved.
+<!--
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="android.overlay.target">
-    <overlay android:targetPackage="android" android:isStatic="true" android:priority="500"/>
+
+    <overlay
+        android:isStatic="true"
+        android:priority="250"
+        android:targetPackage="android" />
 </manifest>
diff --git a/resource-overlay/lahaina/Frameworks/NOTICE b/resource-overlay/lahaina/Frameworks/NOTICE
deleted file mode 100644
index 51aa1aa..0000000
--- a/resource-overlay/lahaina/Frameworks/NOTICE
+++ /dev/null
@@ -1,50 +0,0 @@
-This NOTICE file contains certain notices of software components included
-with the software that Qualcomm Technologies, Inc. ("Qualcomm Technologies")
-is required to provide you. Notwithstanding anything in the notices in this
-file, your use of these software components together with the
-Qualcomm Technologies software (Qualcomm Technologies software hereinafter
-referred to as "Software") is subject to the terms of your license from
-Qualcomm Technologies. Compliance with all copyright laws and software
-license agreements included in the notice section of this file are the
-responsibility of the user. Except as may be granted by separate express
-written agreement, this file provides no license to any patents,
-trademarks, copyrights, or other intellectual property.
-
-Copyright (c) 2019 Qualcomm Technologies, Inc.
-All rights reserved.
-Qualcomm is a registered trademark and registered service mark of
-QUALCOMM Incorporated. All other trademarks and service marks are the
-property of their respective owners.
-________________________________________
-NOTICES
-________________________________________
-
-Copyright (c) 2014-2018,2019 The Linux Foundation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted (subject to the limitations in the
-disclaimer below) provided that the following conditions are met:
-
-   * Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-     copyright notice, this list of conditions and the following
-     disclaimer in the documentation and/or other materials provided
-     with the distribution.
-   * Neither the name of the Linux Foundation nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
-NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
-GRANTED BY THIS LICENSE.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
-HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/resource-overlay/lahaina/Frameworks/res/values/config.xml b/resource-overlay/lahaina/Frameworks/res/values/config.xml
index 8187633..b7b4734 100644
--- a/resource-overlay/lahaina/Frameworks/res/values/config.xml
+++ b/resource-overlay/lahaina/Frameworks/res/values/config.xml
@@ -1,51 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of The Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
 -->
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- When true use the linux /dev/input/event subsystem to detect the switch changes
-    on the headphone/microphone jack. When false use the older uevent framework -->
+         on the headphone/microphone jack. When false use the older uevent framework. -->
     <bool name="config_useDevInputEventForAudioJack">true</bool>
 
-   <!-- Package names to use with vendor iwlan implementation. -->
-   <string name="config_wlan_data_service_package" translatable="false">vendor.qti.iwlan</string>
-   <string name="config_wlan_network_service_package" translatable="false">vendor.qti.iwlan</string>
-   <string name="config_qualified_networks_service_package" translatable="false">vendor.qti.iwlan</string>
-
-   <!-- Default list of files pinned by the Pinner Service -->
-   <string-array translatable="false" name="config_defaultPinnerServiceFiles">
+    <!-- Default files to pin via Pinner Service -->
+    <string-array name="config_defaultPinnerServiceFiles" translatable="false">
         <item>"/apex/com.android.art/javalib/core-oj.jar"</item>
         <item>"/apex/com.android.art/javalib/core-libart.jar"</item>
         <item>"/system/framework/framework.jar"</item>
         <item>"/system/framework/services.jar"</item>
         <item>"/system/bin/surfaceflinger"</item>
         <item>"/system_ext/priv-app/SystemUI/SystemUI.apk"</item>
-   </string-array>
+    </string-array>
 
     <!-- Bytes that the PinnerService will pin for Home app -->
     <integer name="config_pinnerHomePinBytes">6291456</integer>
diff --git a/resource-overlay/lahaina/Frameworks/res/values/config_telephony.xml b/resource-overlay/lahaina/Frameworks/res/values/config_telephony.xml
new file mode 100644
index 0000000..61352a2
--- /dev/null
+++ b/resource-overlay/lahaina/Frameworks/res/values/config_telephony.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
+-->
+<resources>
+    <!-- IWLAN data service package name to bind to by default. If none is specified in an overlay,
+         an empty string is passed in -->
+    <string name="config_wlan_data_service_package" translatable="false">vendor.qti.iwlan</string>
+
+    <!-- IWLAN network service package name to bind to by default. If none is specified in an
+         overlay, an empty string is passed in -->
+    <string name="config_wlan_network_service_package" translatable="false">vendor.qti.iwlan</string>
+
+    <!-- Telephony qualified networks service package name to bind to by default. -->
+    <string name="config_qualified_networks_service_package" translatable="false">vendor.qti.iwlan</string>
+</resources>
diff --git a/resource-overlay/lahaina/Wifi/AndroidManifest.xml b/resource-overlay/lahaina/Wifi/AndroidManifest.xml
index a3df0ff..a3fd5c5 100644
--- a/resource-overlay/lahaina/Wifi/AndroidManifest.xml
+++ b/resource-overlay/lahaina/Wifi/AndroidManifest.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2020, Qualcomm Technologies, Inc.
-    All Rights Reserved.
+<!--
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.wifi.resources.overlay.target">
-    <overlay android:targetPackage="com.android.wifi.resources" android:targetName = "WifiCustomization" android:isStatic="true" android:priority="500"/>
+
+    <overlay
+        android:isStatic="true"
+        android:priority="250"
+        android:targetName="WifiCustomization"
+        android:targetPackage="com.android.wifi.resources" />
 </manifest>
diff --git a/resource-overlay/lahaina/Wifi/res/values/config.xml b/resource-overlay/lahaina/Wifi/res/values/config.xml
index 160d3b2..ef1bffb 100644
--- a/resource-overlay/lahaina/Wifi/res/values/config.xml
+++ b/resource-overlay/lahaina/Wifi/res/values/config.xml
@@ -1,28 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2020 Qualcomm Technologies, Inc.
-     All Rights Reserved.
+<!--
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
 -->
-
-<resources>
-
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Wifi driver supports IEEE80211AX for softap -->
-    <bool translatable="false" name="config_wifiSoftapIeee80211axSupported">true</bool>
+    <bool name="config_wifiSoftapIeee80211axSupported">true</bool>
 
     <!-- Wifi driver supports IEEE80211AX single user beamformer for softap -->
-    <bool translatable="false" name="config_wifiSoftapHeSuBeamformerSupported">true</bool>
+    <bool name="config_wifiSoftapHeSuBeamformerSupported">true</bool>
 
     <!-- Wifi driver supports IEEE80211AX single user beamformee for softap -->
-   <bool translatable="false" name="config_wifiSoftapHeSuBeamformeeSupported">true</bool>
+    <bool name="config_wifiSoftapHeSuBeamformeeSupported">true</bool>
 
     <!-- Wifi driver supports IEEE80211AX multiple user beamformer for softap -->
-    <bool translatable="false" name="config_wifiSoftapHeMuBeamformerSupported">true</bool>
+    <bool name="config_wifiSoftapHeMuBeamformerSupported">true</bool>
 
     <!-- Wifi driver supports IEEE80211AX TWT (Target Wake Time) for softap -->
-    <bool translatable="false" name="config_wifiSoftapHeTwtSupported">true</bool>
+    <bool name="config_wifiSoftapHeTwtSupported">true</bool>
 
-    <!-- Indicate the driver support NL80211_REG_CHANGED event. -->
-    <bool translatable="false" name="config_wifiDriverSupportedNl80211RegChangedEvent">true</bool>
+    <!-- A boolean indicate if device supports ser channel on the Aware data-path setup. If the
+    value is false, channel setting on the data-path request will be ignored.
+    -->
+    <bool name="config_wifiSupportChannelOnDataPath">true</bool>
 
-    <!-- Indicate the device support request channel on Wi-Fi Aware data-path. -->
-    <bool translatable="false" name="config_wifiSupportChannelOnDataPath">true</bool>
+    <!-- Indicates whether or not the WLAN driver supports the NL80211_CMD_REG_CHANGE or
+         NL80211_CMD_WIPHY_REG_CHANGE events which indicate the current country code which is
+         being used by the WLAN driver. If the driver doesn't support these events
+         (configuration is `false`) then the driver must handle the setCountryCode request from
+         HAL as a blocking call. In such a case the country code will be applied
+         immediately after the country code is sent to the driver (if the method returns a
+         success). -->
+    <bool name="config_wifiDriverSupportedNl80211RegChangedEvent">true</bool>
 </resources>