Merge "Revert "libvirtual: Fix logic to detect DRC use case""