Align ASO for kill/resubmit.
Merge pull request #4031 from HassenRiahi/AlignASOForKillResub

Align ASO for kill/resubmit.