DO NOT MERGE: Clean up when recycling a pid with a pending launch am:...
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7 am: 29ae7b1a am: 39c78793
am: 5841c492 -s ours
Change-Id: Ia483fee611b51ad0187b625c62d32877e73ff551