diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f7f2322
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+
+universal7885-common/vendor_name
+a20e/AndroidProducts.mk
+a20/AndroidProducts.mk
+
diff --git a/a20e/AndroidProducts.mk b/a20e/AndroidProducts.mk
new file mode 100644
index 0000000..27de13f
--- /dev/null
+++ b/a20e/AndroidProducts.mk
@@ -0,0 +1,2 @@
+# Auto-Generated by device/samsung/a20e/setup.sh
+PRODUCT_MAKEFILES += $(LOCAL_DIR)/aosp_a20e.mk
diff --git a/universal7885-common/manifest.xml b/universal7885-common/manifest.xml
index 68192f6..f4ea1cd 100644
--- a/universal7885-common/manifest.xml
+++ b/universal7885-common/manifest.xml
@@ -65,8 +65,8 @@
             <name>IDrmFactory</name>
             <instance>default</instance>
         </interface>
-        <fqname>@1.2::ICryptoFactory/widevine</fqname>
-        <fqname>@1.2::IDrmFactory/widevine</fqname>
+        <fqname>@1.3::ICryptoFactory/widevine</fqname>
+        <fqname>@1.3::IDrmFactory/widevine</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.gatekeeper</name>
diff --git a/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml b/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml
index a243fcc..0193f85 100644
--- a/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml
@@ -29,7 +29,6 @@
         <item>"/system_ext/priv-app/SystemUI/SystemUI.apk"</item>
         <item>"/system/bin/surfaceflinger"</item>
     </string-array>
-    <bool name="config_pinnerCameraApp">true</bool>
     <string name="config_radio_access_family">GSM|CDMA|EVDO|WCDMA|LTE</string>
     <integer name="config_fingerprintMaxTemplatesPerUser">4</integer>
     <integer-array name="config_longPressVibePattern">
diff --git a/universal7885-common/rootdir/Android.mk b/universal7885-common/rootdir/Android.mk
index 032912c..2aea90e 100644
--- a/universal7885-common/rootdir/Android.mk
+++ b/universal7885-common/rootdir/Android.mk
@@ -40,3 +40,11 @@ LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := etc/$(LOCAL_MODULE)
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init
 include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE       := debug.rc
+LOCAL_MODULE_TAGS  := optional
+LOCAL_MODUE_CLASS  := ETC
+LOCAL_SRC_FILES    := etc/$(LOCAL_MODULE)
+LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init
+include $(BUILD_PREBUILT)
diff --git a/universal7885-common/rootdir/etc/debug.rc b/universal7885-common/rootdir/etc/debug.rc
new file mode 100644
index 0000000..85ca6e4
--- /dev/null
+++ b/universal7885-common/rootdir/etc/debug.rc
@@ -0,0 +1,17 @@
+on property:sys.boot_completed=1
+    stop kerneld
+    stop logd
+
+on post-fs-data
+    rm /data/kmsg.txt
+    rm /data/misc/logd/logcat.txt
+
+service kerneld /system/bin/sh -c "cat /proc/kmsg > /data/kmsg.txt"
+   class main
+   user root
+   group system
+
+service logcatd /system/bin/logcat -f /data/misc/logd/logcat.txt -v threadtime
+   class main
+   user root
+   group system
diff --git a/universal7885-common/sepolicy/vendor/hal_keymaster_default.te b/universal7885-common/sepolicy/vendor/hal_keymaster_default.te
index 31462c9..8db9d0e 100644
--- a/universal7885-common/sepolicy/vendor/hal_keymaster_default.te
+++ b/universal7885-common/sepolicy/vendor/hal_keymaster_default.te
@@ -1 +1 @@
-allow hal_keymaster_default prov_efs_file r_file_perms;
\ No newline at end of file
+allow hal_keymaster_default prov_efs_file:file r_file_perms;
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index d93bbe9..1de457a 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -270,3 +270,13 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf
     
 PRODUCT_CFI_INCLUDE_PATHS += hardware/samsung_slsi/scsc_wifibt/wpa_supplicant_lib
+
+# SamsungParts
+PRODUCT_PACKAGES += \
+	SamsungParts \
+	android.software.samsungparts@1.0-service
+
+# Debug
+ifeq ($(TARGET_BUILD_VARIENT),eng)
+PRODUCT_PACKAGES += debug.rc
+endif
diff --git a/universal7885-common/vendor_name b/universal7885-common/vendor_name
new file mode 100644
index 0000000..7127f7d
--- /dev/null
+++ b/universal7885-common/vendor_name
@@ -0,0 +1 @@
+aosp