Merge "Fix Bug 3663: Update netvirt.impl UT"