Merge changes from topic "presubmit-am-41e144351270485b94f495fc32653e46"
* changes:
[automerge] Revert "Wait for an abort event when stopping a model" 2p: 64c62ca5 2p: 958db372
[automerge] Revert "Wait for an abort event when stopping a model" 2p: 64c62ca5
Revert "Wait for an abort event when stopping a model"