am 92fba41f: am 9d958f69: Merge "Allow killed task to remove itself" into klp-dev

* commit '92fba41f3c64407f6827399bfa40bbcf6eac9212':
  Allow killed task to remove itself