Change state to waiting during aborting the VM am: 97b9649601
am: 90d0495677

Change-Id: Ib1396c040721768467d9c889aa127ac593b56db9