diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 4631cf8..b265d5c 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -80,12 +80,13 @@
         "cgroups.json",
         "public.libraries.android.txt",
 
-        "microdroid_plat_sepolicy_and_mapping.sha256",
+        "microdroid_compatibility_matrix",
+        "microdroid_event-log-tags",
         "microdroid_file_contexts",
+        "microdroid_manifest",
+        "microdroid_plat_sepolicy_and_mapping.sha256",
         "microdroid_property_contexts",
         "microdroid_service_contexts",
-        "microdroid_compatibility_matrix",
-        "microdroid_manifest",
 
         // TODO(b/195425111) these four should be added automatically
         "android.hardware.security.secureclock-V1-ndk",
@@ -605,3 +606,10 @@
     relative_install_path: "vintf",
     installable: false,
 }
+
+prebuilt_etc {
+    name: "microdroid_event-log-tags",
+    src: "microdroid_event-log-tags",
+    filename: "event-log-tags",
+    installable: false,
+}
\ No newline at end of file
diff --git a/microdroid/microdroid_event-log-tags b/microdroid/microdroid_event-log-tags
new file mode 100644
index 0000000..10743cd
--- /dev/null
+++ b/microdroid/microdroid_event-log-tags
@@ -0,0 +1,51 @@
+42    answer (to life the universe etc|3)
+314   pi
+1003  auditd (avc|3)
+1004  chatty (dropped|3)
+1005  tag_def (tag|1),(name|3),(format|3)
+1006  liblog (dropped|1)
+2718  e
+2720 sync (id|3),(event|1|5),(source|1|5),(account|1|5)
+2740 location_controller
+2741 force_gc (reason|3)
+2742 tickle (authority|3)
+2747 contacts_aggregation (aggregation time|2|3), (count|1|1)
+3000 boot_progress_start (time|2|3)
+3020 boot_progress_preload_start (time|2|3)
+3030 boot_progress_preload_end (time|2|3)
+20003 dvm_lock_sample (process|3),(main|1|5),(thread|3),(time|1|3),(file|3),(line|1|5),(ownerfile|3),(ownerline|1|5),(sample_percent|1|6)
+20004 art_hidden_api_access (access_method|1),(flags|1),(class|3),(member|3),(type_signature|3)
+50000 menu_item_selected (Menu type where 0 is options and 1 is context|1|5),(Menu item title|3)
+50001 menu_opened (Menu type where 0 is options and 1 is context|1|5)
+50021 wifi_state_changed (wifi_state|3)
+50022 wifi_event_handled (wifi_event|1|5)
+50023 wifi_supplicant_state_changed (supplicant_state|1|5)
+52000 db_sample (db|3),(sql|3),(time|1|3),(blocking_package|3),(sample_percent|1|6)
+52001 http_stats (useragent|3),(response|2|3),(processing|2|3),(tx|1|2),(rx|1|2)
+60000 viewroot_draw (Draw time|1|3)
+60001 viewroot_layout (Layout time|1|3)
+60002 view_build_drawing_cache (View created drawing cache|1|5)
+60003 view_use_drawing_cache (View drawn using bitmap cache|1|5)
+70200 aggregation (aggregation time|2|3)
+70201 aggregation_test (field1|1|2),(field2|1|2),(field3|1|2),(field4|1|2),(field5|1|2)
+70220 gms_unknown
+75000 sqlite_mem_alarm_current (current|1|2)
+75001 sqlite_mem_alarm_max (max|1|2)
+75002 sqlite_mem_alarm_alloc_attempt (attempts|1|4)
+75003 sqlite_mem_released (Memory released|1|2)
+75004 sqlite_db_corrupt (Database file corrupt|3)
+80100 bionic_event_memcpy_buffer_overflow (uid|1)
+80105 bionic_event_strcat_buffer_overflow (uid|1)
+80110 bionic_event_memmov_buffer_overflow (uid|1)
+80115 bionic_event_strncat_buffer_overflow (uid|1)
+80120 bionic_event_strncpy_buffer_overflow (uid|1)
+80125 bionic_event_memset_buffer_overflow (uid|1)
+80130 bionic_event_strcpy_buffer_overflow (uid|1)
+80200 bionic_event_strcat_integer_overflow (uid|1)
+80205 bionic_event_strncat_integer_overflow (uid|1)
+80300 bionic_event_resolver_old_response (uid|1)
+80305 bionic_event_resolver_wrong_server (uid|1)
+80310 bionic_event_resolver_wrong_query (uid|1)
+90100 exp_det_cert_pin_failure (certs|4)
+1397638484 snet_event_log (subtag|3) (uid|1) (message|3)
+1937006964 stats_log (atom_id|1|5),(data|4)
diff --git a/virtualizationservice/src/composite.rs b/virtualizationservice/src/composite.rs
index cb814f3..aee84cd 100644
--- a/virtualizationservice/src/composite.rs
+++ b/virtualizationservice/src/composite.rs
@@ -94,8 +94,8 @@
                 .as_ref()
                 .try_clone()
                 .context("Failed to clone partition image file descriptor")?;
-            let size = get_partition_size(&file)?;
             let path = fd_path_for_file(&file);
+            let size = get_partition_size(&file, &path)?;
             files.push(file);
 
             Ok(PartitionInfo {
@@ -119,9 +119,9 @@
 /// Find the size of the partition image in the given file by parsing the header.
 ///
 /// This will work for raw, QCOW2, composite and Android sparse images.
-fn get_partition_size(partition: &File) -> Result<u64, Error> {
+fn get_partition_size(partition: &File, path: &Path) -> Result<u64, Error> {
     // TODO: Use `context` once disk::Error implements std::error::Error.
-    Ok(create_disk_file(partition.try_clone()?, MAX_NESTING_DEPTH)
+    Ok(create_disk_file(partition.try_clone()?, MAX_NESTING_DEPTH, path)
         .map_err(|e| anyhow!("Failed to open partition image: {}", e))?
         .get_len()?)
 }
diff --git a/zipfuse/TEST_MAPPING b/zipfuse/TEST_MAPPING
index 81a8aeb..ef398a0 100644
--- a/zipfuse/TEST_MAPPING
+++ b/zipfuse/TEST_MAPPING
@@ -3,5 +3,10 @@
     {
       "name" : "ZipFuseTest"
     }
+  ],
+  "hwasan-postsubmit" : [
+    {
+      "name" : "ZipFuseTest"
+    }
   ]
 }