Merge "libvirtual: Cleanup patch for DRC feature"