8175932: Improve host instance supports

Reviewed-by: coleenp, mschoene
2 files changed