DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27 am: 39c7879365 am: 5841c492a7  -s ours am: f705730667
am: b07b5f745a

Change-Id: I594d38d8ccc37beefc533c18e3eccf76eb3b3669