Group virt config

Change-Id: Ida46ac7c785582735ec7ef315099d877f34a166c
Merge "Group virt config"