use SG id in place of name to remove it from VM

Change-Id: I2ca3dd629b2d33080769b7851545da9288c457d9
Merge "use SG id in place of name to remove it from VM" into R2.0