Merge changes Ie098a1e9,Iaff910f0 am: 8c0de55863

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

Change-Id: I1db5440701301aa48297900e30eba18de81d849f