diff --git a/tools/releasetools/ota_utils.py b/tools/releasetools/ota_utils.py
index 81bc78e5a5..0da9fefedd 100644
--- a/tools/releasetools/ota_utils.py
+++ b/tools/releasetools/ota_utils.py
@@ -223,9 +223,13 @@ def UpdateDeviceState(device_state, build_info, boot_variable_values,
       partition_devices = set()
       partition_fingerprints = set()
       for runtime_build_info in build_info_set:
-        partition_devices.add(
-            runtime_build_info.GetPartitionBuildProp('ro.product.device',
-                                                     partition))
+        try:
+            partition_devices.add(
+                runtime_build_info.GetPartitionBuildProp('ro.product.device',
+                                                         partition))
+        except common.ExternalError:
+            partition_devices.add(
+                runtime_build_info.GetBuildProp('ro.product.device'))
         partition_fingerprints.add(
             runtime_build_info.GetPartitionFingerprint(partition))