release-request-0b3ce0b0-0f38-494b-a590-b594ba11c2d2-for-git_oc-release-4098933 snap-temp-L41500000074000728

Change-Id: Idf7193dd712acbe909e2f9a032540cd253d56528
diff --git a/harnesses/tradefed/src/com/android/tradefed/targetprep/VtsDeviceInfoCollector.java b/harnesses/tradefed/src/com/android/tradefed/targetprep/VtsDeviceInfoCollector.java
index d70b9e9..f1db241 100644
--- a/harnesses/tradefed/src/com/android/tradefed/targetprep/VtsDeviceInfoCollector.java
+++ b/harnesses/tradefed/src/com/android/tradefed/targetprep/VtsDeviceInfoCollector.java
@@ -47,7 +47,7 @@
         BUILD_KEYS.put("cts:build_model", "ro.product.model");
         BUILD_KEYS.put("cts:build_type", "ro.build.type");
         BUILD_KEYS.put("cts:build_tags", "ro.build.tags");
-        BUILD_KEYS.put("cts:build_fingerprint", "ro.build.fingerprint");
+        BUILD_KEYS.put("cts:build_fingerprint", "ro.vendor.build.fingerprint");
         BUILD_KEYS.put("cts:build_abi", "ro.product.cpu.abi");
         BUILD_KEYS.put("cts:build_abi2", "ro.product.cpu.abi2");
         BUILD_KEYS.put("cts:build_abis", "ro.product.cpu.abilist");
@@ -59,6 +59,7 @@
         BUILD_KEYS.put("cts:build_version_base_os", "ro.build.version.base_os");
         BUILD_KEYS.put("cts:build_version_security_patch", "ro.build.version.security_patch");
         BUILD_KEYS.put("cts:build_reference_fingerprint", "ro.build.reference.fingerprint");
+        BUILD_KEYS.put("cts:build_system_fingerprint", "ro.build.fingerprint");
         BUILD_KEYS.put("cts:build_vendor_fingerprint", "ro.vendor.build.fingerprint");
     }