Fix VirtualBox nodes removal

Change-Id: Ic764333339e0dc1018c539a675db6f65f7e1d04f
Merge "Fix VirtualBox nodes removal"