Revert "Change state to waiting during aborting the VM" am: ebb481d070
am: a7fc1d12db

Change-Id: I090c65fa0478f8be1b161285d3e4d618c56c846d