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

Change-Id: If772a23807676aa576afc28decb98fdcb59b2d9c