diff --git a/core/build_id.mk b/core/build_id.mk
index 11f4a8066..938cdeff3 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=RVC
+BUILD_ID=RQ1A.210105.003
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index d3ad4f4b0..6ac90d8d3 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -240,7 +240,7 @@ ifndef PLATFORM_SECURITY_PATCH
     #  It must be of the form "YYYY-MM-DD" on production devices.
     #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
     #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
-      PLATFORM_SECURITY_PATCH := 2020-11-05
+      PLATFORM_SECURITY_PATCH := 2021-01-05
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH
 
diff --git a/envsetup.sh b/envsetup.sh
index 793f4b6cf..cc516e9a1 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1510,6 +1510,29 @@ function mmma()
 
 function make()
 {
+    if [ -f $ANDROID_BUILD_TOP/$EL_BUILDTOOLS_DIR/build/update-vendor-hal-makefiles.sh ]; then
+        vendor_hal_script=$ANDROID_BUILD_TOP/$EL_BUILDTOOLS_DIR/build/update-vendor-hal-makefiles.sh
+        source $vendor_hal_script --check
+        regen_needed=$?
+
+        if [ $regen_needed -eq 1 ]; then
+            _wrap_build $(get_make_command hidl-gen) hidl-gen ALLOW_MISSING_DEPENDENCIES=true
+            RET=$?
+            if [ $RET -ne 0 ]; then
+                echo -n "${color_failed}#### hidl-gen compilation failed, check above errors"
+                echo " ####${color_reset}"
+                return $RET
+            fi
+            source $vendor_hal_script
+            RET=$?
+            if [ $RET -ne 0 ]; then
+                echo -n "${color_failed}#### HAL file .bp generation failed dure to incpomaptible HAL files , please check above error log"
+                echo " ####${color_reset}"
+                return $RET
+            fi
+        fi
+    fi
+
     _wrap_build $(get_make_command "$@") "$@"
 }
 
diff --git a/target/product/full_base.mk b/target/product/full_base.mk
index ffd3cde11..69a92bc6c 100644
--- a/target/product/full_base.mk
+++ b/target/product/full_base.mk
@@ -61,3 +61,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk)
 
 # Add adb keys to debuggable AOSP builds (if they exist)
 $(call inherit-product-if-exists, vendor/google/security/adb/vendor_key.mk)
+
+# Get Explosive Lobster additional settings/packages
+$(call inherit-product-if-exists, vendor/el/el.mk)
diff --git a/target/product/media_system.mk b/target/product/media_system.mk
index 4d507b5fb..2c0553869 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -37,6 +37,8 @@ PRODUCT_PACKAGES += \
     requestsync \
     StatementService \
 
+PRODUCT_PACKAGES += Seedvault
+
 PRODUCT_HOST_PACKAGES += \
     fsck.f2fs \