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

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