Merge "Data written to instance.img has schema" am: f04e45daee am: 341ea703bb

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/1820412

Change-Id: I7fc96cd9462a6583ea2d13fa6e877431fcb8b7e7