Merge "Add USE_CUSTOM_VIRTUAL_MACHINE permission to Shell"