am 7987d84e: am d1d91eca: am 7cb1dfe6: Merge "Insufficient ProcessRecord cleanup when persistent process is killed"

* commit '7987d84e35fb8d7a20ef33786906968e8b7f2dc2':
  Insufficient ProcessRecord cleanup when persistent process is killed