Revert "Revert "Change state to waiting during aborting the VM""
am: 34857b5fd3

Change-Id: Id3834c47cc3a8b8b66377f4539b9d080c85d31a4