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

Change-Id: Ia483fee611b51ad0187b625c62d32877e73ff551