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

Change-Id: I9787124f8a2fc006dfdb94f9fe661e796b79feac