Merge 0858d8c42fd2e2700b1a55d7f538edaf880172a8 on remote branch

Change-Id: I886ec762b27c9952f03f319aca46f2f713fe42ee
diff --git a/TEST_MAPPING b/TEST_MAPPING
index ec89789..eea7991 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -22,6 +22,21 @@
       "name": "authfs_device_test_src_lib"
     },
     {
+      "name": "diced_open_dice_cbor_test"
+    },
+    {
+      "name": "diced_sample_inputs_test"
+    },
+    {
+      "name": "diced_test"
+    },
+    {
+      "name": "diced_utils_test"
+    },
+    {
+      "name": "diced_vendor_test"
+    },
+    {
       "name": "doh_unit_test"
     },
     {
@@ -52,10 +67,13 @@
       "name": "libapkverify.test"
     },
     {
-      "name": "microdroid_manager_test"
+      "name": "libcert_request_validator_tests"
     },
     {
-      "name": "open_then_run_module"
+      "name": "librustutils_test"
+    },
+    {
+      "name": "microdroid_manager_test"
     },
     {
       "name": "virtualizationservice_device_test"
@@ -72,6 +90,21 @@
       "name": "authfs_device_test_src_lib"
     },
     {
+      "name": "diced_open_dice_cbor_test"
+    },
+    {
+      "name": "diced_sample_inputs_test"
+    },
+    {
+      "name": "diced_test"
+    },
+    {
+      "name": "diced_utils_test"
+    },
+    {
+      "name": "diced_vendor_test"
+    },
+    {
       "name": "doh_unit_test"
     },
     {
@@ -102,10 +135,13 @@
       "name": "libapkverify.test"
     },
     {
-      "name": "microdroid_manager_test"
+      "name": "libcert_request_validator_tests"
     },
     {
-      "name": "open_then_run_module"
+      "name": "librustutils_test"
+    },
+    {
+      "name": "microdroid_manager_test"
     },
     {
       "name": "virtualizationservice_device_test"