DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099  -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180  -s ours am: b6cc1acb63 am: 258c3eab25
am: 7c83c68c71  -s ours

Change-Id: I6870733abf28ed829dff1e453425b8b7dd88fb15