diff --git a/tradefed_cluster/api_messages.py b/tradefed_cluster/api_messages.py
index 37dc9ea..22218ab 100644
--- a/tradefed_cluster/api_messages.py
+++ b/tradefed_cluster/api_messages.py
@@ -683,6 +683,8 @@
     test_harness: test harness the device is running under.
     recovery_state: recovery state for the host, e.g. assigned, fixed, verified.
     last_recovery_time: the last time the device gets recovered.
+    is_stub_device: specifies if the device is a stub device.
+    display_serial: the serial used for display purpose.
   """
   device_serial = messages.StringField(1)
   lab_name = messages.StringField(2)
@@ -714,6 +716,8 @@
   test_harness = messages.StringField(26)
   recovery_state = messages.StringField(27)
   last_recovery_time = message_types.DateTimeField(28)
+  is_stub_device = messages.BooleanField(29)
+  display_serial = messages.StringField(30)
 
 
 class DeviceInfoCollection(messages.Message):
diff --git a/tradefed_cluster/cluster_device_api.py b/tradefed_cluster/cluster_device_api.py
index bfd516c..f2f57a7 100644
--- a/tradefed_cluster/cluster_device_api.py
+++ b/tradefed_cluster/cluster_device_api.py
@@ -128,7 +128,9 @@
         test_harness=document.get("test_harness"),
         recovery_state=document.get("recovery_state"),
         flated_extra_info=document.get("flated_extra_info"),
-        last_recovery_time=last_recovery_time)
+        last_recovery_time=last_recovery_time,
+        is_stub_device=document.get("is_stub_device"),
+        display_serial=document.get("display_serial"))
 
   @api_common.method(
       DEVICE_LIST_RESOURCE,
diff --git a/tradefed_cluster/datastore_entities.py b/tradefed_cluster/datastore_entities.py
index 34e78b2..094c01d 100644
--- a/tradefed_cluster/datastore_entities.py
+++ b/tradefed_cluster/datastore_entities.py
@@ -1795,6 +1795,8 @@
     flated_extra_info: flated extra info for the device
     recovery_state: recovery state for the host, e.g. assigned, fixed, verified.
     last_recovery_time: last time the device was recovered.
+    is_stub_device: specifies if the device is a stub device.
+    display_serial: the serial used for display purpose.
   """
   device_serial = ndb.StringProperty()
   run_target = ndb.StringProperty()
@@ -1829,6 +1831,8 @@
       repeated=True)
   recovery_state = ndb.StringProperty()
   last_recovery_time = ndb.DateTimeProperty()
+  is_stub_device = ndb.BooleanProperty(default=False)
+  display_serial = ndb.StringProperty()
 
   def _post_put_hook(self, future):
     if not env_config.CONFIG.use_elasticsearch:
@@ -1878,7 +1882,9 @@
       test_harness=device_info_entity.test_harness,
       recovery_state=device_info_entity.recovery_state,
       flated_extra_info=device_info_entity.flated_extra_info,
-      last_recovery_time=device_info_entity.last_recovery_time)
+      last_recovery_time=device_info_entity.last_recovery_time,
+      is_stub_device=device_info_entity.is_stub_device,
+      display_serial=device_info_entity.display_serial)
 
 
 class DeviceInfoHistory(DeviceInfo):
diff --git a/tradefed_cluster/device_manager.py b/tradefed_cluster/device_manager.py
index 547d1f6..c449918 100644
--- a/tradefed_cluster/device_manager.py
+++ b/tradefed_cluster/device_manager.py
@@ -73,6 +73,8 @@
 HOST_NOTE_ID_KEY = "host_note_id"
 DEVICE_NOTE_ID_KEY = "device_note_id"
 TEST_HARNESS_START_TIME_MS = "test_harness_start_time_ms"
+IS_STUB_DEVICE_KEY = "is_stub_device"
+DISPLAY_SERIAL_KEY = "display_serial"
 
 DEVICE_SNAPSHOT_TYPES = ("DeviceSnapshot", "DEVICE_SNAPSHOT")
 HOST_STATE_CHANGED_TYPES = ("HostStateChanged", "HOST_STATE_CHANGED")
@@ -544,6 +546,8 @@
   device.battery_level = device_data.get(BATTERY_LEVEL_KEY)
   device.extra_info[BATTERY_LEVEL_KEY] = device.battery_level
   device.device_type = device_type
+  device.is_stub_device = device_data.get(IS_STUB_DEVICE_KEY)
+  device.display_serial = device_data.get(DISPLAY_SERIAL_KEY)
 
   device_state_history, device_history = _UpdateDevicePropertiesAndGetHistory(
       device, host_event.timestamp, state=device_state, run_target=run_target)