diff --git a/conf/init.debug.rc b/conf/init.debug.rc
index b7512e4e..4d5e4c77 100644
--- a/conf/init.debug.rc
+++ b/conf/init.debug.rc
@@ -32,3 +32,12 @@ on post-fs-data
     chown bluetooth system /dev/logbuffer_btlpm
     chown bluetooth system /dev/logbuffer_btpower
     chown bluetooth system /dev/logbuffer_tty18
+
+# pKVM performance is different on A0 and B0 chips.
+# Add extra tag to metrics collected on A0 to separate the results.
+on property:ro.revision=PROTO1.0
+    setprop debug.hypervisor.metrics_tag "hwrev_a0"
+on property:ro.revision=PROTO1.1
+    setprop debug.hypervisor.metrics_tag "hwrev_a0"
+on property:ro.revision=EVT1.0
+    setprop debug.hypervisor.metrics_tag "hwrev_a0"
diff --git a/device.mk b/device.mk
index f7783582..527021d1 100644
--- a/device.mk
+++ b/device.mk
@@ -516,6 +516,7 @@ CHEETAH_PRODUCT := %cheetah
 LYNX_PRODUCT := %lynx
 FELIX_PRODUCT := %felix
 CLOUDRIPPER_PRODUCT := %cloudripper
+TANGOR_PRODUCT := %tangorpro
 ifneq (,$(filter $(PANTHER_PRODUCT), $(TARGET_PRODUCT)))
         LOCAL_TARGET_PRODUCT := panther
 else ifneq (,$(filter $(CHEETAH_PRODUCT), $(TARGET_PRODUCT)))
@@ -526,6 +527,8 @@ else ifneq (,$(filter $(FELIX_PRODUCT), $(TARGET_PRODUCT)))
         LOCAL_TARGET_PRODUCT := felix
 else ifneq (,$(filter $(CLOUDRIPPER_PRODUCT), $(TARGET_PRODUCT)))
         LOCAL_TARGET_PRODUCT := cloudripper
+else ifneq (,$(filter $(TANGOR_PRODUCT), $(TARGET_PRODUCT)))
+        LOCAL_TARGET_PRODUCT := tangorpro
 else
         # WAR: continue defaulting to slider build on gs201 to not
         # break dev targets such as ravenclaw