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

Change-Id: I48acd4fad847ed36bd459d4e75db7b5828ec8a60