Various minor fixes am: 62d012dd99

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

Change-Id: I6f05a85503ddb436c6de3de8fca6a4b0acb03751
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>