am f610c059: Merge "Don\'t add or remove verifiers if aborting"

* commit 'f610c0597e001cb1043aa4074afe25ae79a800e3':
  Don't add or remove verifiers if aborting