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

Change-Id: Ib6684a9fc5f6333240690f5b9d5df3643251db03