diff --git a/core/Makefile b/core/Makefile
index 4e61d7f..153d340 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -446,7 +446,7 @@
 	        PLATFORM_VERSION="$(PLATFORM_VERSION)" \
 	        PLATFORM_VERSION_LAST_STABLE="$(PLATFORM_VERSION_LAST_STABLE)" \
 	        PLATFORM_SECURITY_PATCH="$(PLATFORM_SECURITY_PATCH)" \
-	        PLATFORM_SECURITY_PATCH_BLISS="$(PLATFORM_SECURITY_PATCH_BLISS)" \
+	        PLATFORM_REAL_SECURITY_PATCH="$(PLATFORM_REAL_SECURITY_PATCH)" \
 	        PLATFORM_BASE_OS="$(PLATFORM_BASE_OS)" \
 	        PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \
 	        PLATFORM_PREVIEW_SDK_VERSION="$(PLATFORM_PREVIEW_SDK_VERSION)" \
@@ -455,6 +455,7 @@
 	        PLATFORM_VERSION_ALL_CODENAMES="$(PLATFORM_VERSION_ALL_CODENAMES)" \
 	        PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION="$(PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION)" \
 	        BUILD_VERSION_TAGS="$(BUILD_VERSION_TAGS)" \
+	        BUILD_FINGERPRINT="$(BUILD_FINGERPRINT_FROM_FILE)" \
 	        $(if $(OEM_THUMBPRINT_PROPERTIES),BUILD_THUMBPRINT="$(BUILD_THUMBPRINT_FROM_FILE)") \
 	        TARGET_CPU_ABI_LIST="$(TARGET_CPU_ABI_LIST)" \
 	        TARGET_CPU_ABI_LIST_32_BIT="$(TARGET_CPU_ABI_LIST_32_BIT)" \
@@ -1247,11 +1248,6 @@
 endif
 endif
 
-ifneq (,$(PLATFORM_SECURITY_PATCH_OVERRIDE))
-      PLATFORM_SECURITY_PATCH_BLISS := $(PLATFORM_SECURITY_PATCH)
-      PLATFORM_SECURITY_PATCH := $(PLATFORM_SECURITY_PATCH_OVERRIDE)
-endif
-
 INTERNAL_MKBOOTIMG_VERSION_ARGS := \
     --os_version $(PLATFORM_VERSION_LAST_STABLE) \
     --os_patch_level $(PLATFORM_SECURITY_PATCH)
diff --git a/core/soong_config.mk b/core/soong_config.mk
index 47fa2c7..7c6410a 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -33,7 +33,6 @@
 $(call add_json_bool, Platform_sdk_final,                $(filter REL,$(PLATFORM_VERSION_CODENAME)))
 $(call add_json_csv,  Platform_version_active_codenames, $(PLATFORM_VERSION_ALL_CODENAMES))
 $(call add_json_str,  Platform_security_patch,           $(PLATFORM_SECURITY_PATCH))
-$(call add_json_str,  Platform_security_patch_bliss,     $(PLATFORM_SECURITY_PATCH_BLISS))
 $(call add_json_str,  Platform_preview_sdk_version,      $(PLATFORM_PREVIEW_SDK_VERSION))
 $(call add_json_str,  Platform_base_os,                  $(PLATFORM_BASE_OS))
 
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 4bc4498..bdf0cbe 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -242,7 +242,7 @@
     #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
       PLATFORM_SECURITY_PATCH := 2021-09-05
 endif
-.KATI_READONLY := PLATFORM_SECURITY_PATCH
+PLATFORM_REAL_SECURITY_PATCH := $(PLATFORM_SECURITY_PATCH)
 
 ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP
   # Used to indicate the matching timestamp for the security patch string in PLATFORM_SECURITY_PATCH.
diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh
index 290530a..59d3e09 100755
--- a/tools/buildinfo.sh
+++ b/tools/buildinfo.sh
@@ -14,7 +14,7 @@
 echo "ro.build.version.release=$PLATFORM_VERSION_LAST_STABLE"
 echo "ro.build.version.release_or_codename=$PLATFORM_VERSION"
 echo "ro.build.version.security_patch=$PLATFORM_SECURITY_PATCH"
-echo "ro.bliss.version.security_patch=$PLATFORM_SECURITY_PATCH_BLISS"
+echo "ro.build.version.real_security_patch=$PLATFORM_REAL_SECURITY_PATCH"
 echo "ro.build.version.base_os=$PLATFORM_BASE_OS"
 echo "ro.build.version.min_supported_target_sdk=$PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION"
 echo "ro.build.date=`$DATE`"
@@ -50,6 +50,7 @@
 
 echo "# Do not try to parse description or thumbprint"
 echo "ro.build.description=$PRIVATE_BUILD_DESC"
+echo "ro.build.fingerprint=$BUILD_FINGERPRINT"
 if [ -n "$BUILD_THUMBPRINT" ] ; then
   echo "ro.build.thumbprint=$BUILD_THUMBPRINT"
 fi