Merge "Use apex_name as partition name when using mk_payload"
diff --git a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
index 32bdf3b..1c19627 100644
--- a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
+++ b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
@@ -263,8 +263,8 @@
// - apk and idsig
disks.put(new JSONObject().put("writable", false).put("partitions", new JSONArray()
.put(newPartition("payload-metadata", payloadMetadataPath))
- .put(newPartition("microdroid-apex-0", statsdApexPath))
- .put(newPartition("microdroid-apex-1", adbdApexPath))
+ .put(newPartition("com.android.os.statsd", statsdApexPath))
+ .put(newPartition("com.android.adbd", adbdApexPath))
.put(newPartition("microdroid-apk", apkPath))
.put(newPartition("microdroid-apk-idsig", idSigPath))));