Update delete handling of virtual machines in SI

Change-Id: Idcfbdfc9d8292dd27103e116774b49aed13769b9
Merge "Update delete handling of virtual machines in SI" into R1.10