Fixing SI_vm_name_change

Change-Id: I89807f98e430357900d492ad4ad0d1c9ceb2ed5c
Merge "Fixing SI_vm_name_change" into R1.10