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

* commit '3a18a92ee513881e232bd899b45cdf7132bb199e':
  Allow killed task to remove itself