Merge changes Ib3fd9047,I3126932f,I3450f496 am: 03ef64b4 am: 099ba9fd am: 0d32bf84 am: a528f840 am: c9b16a82 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2012319 Change-Id: I8d9ae1ab45befe03631737171644874ccd4f13ee