diff --git a/core/Makefile b/core/Makefile
index 67174dbfc2652f62826509d775bca0f39fe3577e..b2e936e090af79f1b39e4049d417ff32834e7cd8 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -310,12 +310,16 @@ endif
 #BUILD_DISPLAY_KEYS is used in etc/build.prop and product build.prop to avoid override by vendor, 
 #so ro.build.display.id will be set twice, only product build.prop will be used at the end
 ifndef RELEASE_TYPE
-  BUILD_DISPLAY_KEYS := $(BUILD_KEYS)
+ifeq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/make/target/product/security/testkey)
+BUILD_RELEASE_TYPE := test-release
 else
-  BUILD_DISPLAY_KEYS := $(RELEASE_TYPE)-keys
+BUILD_RELEASE_TYPE := unknown-release
 endif
-
-BUILD_VERSION_TAGS += $(BUILD_DISPLAY_KEYS)
+else
+BUILD_RELEASE_TYPE := $(RELEASE_TYPE)-release
+endif
+BUILD_VERSION_TAGS += $(BUILD_KEYS)
+BUILD_VERSION_TAGS += $(BUILD_RELEASE_TYPE)
 BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS)))
 
 # A human-readable string that descibes this build in detail.
@@ -370,9 +374,9 @@ ifeq ($(TARGET_BUILD_VARIANT),user)
 
   # Dev. branches should have DISPLAY_BUILD_NUMBER set
   ifeq (true,$(DISPLAY_BUILD_NUMBER))
-    BUILD_DISPLAY_ID := $(BUILD_ID).$(BUILD_NUMBER_FROM_FILE) $(BUILD_DISPLAY_KEYS)
+    BUILD_DISPLAY_ID := $(BUILD_ID).$(BUILD_NUMBER_FROM_FILE) $(BUILD_KEYS) $(BUILD_RELEASE_TYPE)
   else
-    BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_DISPLAY_KEYS)
+    BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_KEYS) $(BUILD_RELEASE_TYPE)
   endif
 else
   # Non-user builds should show detailed build information