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: b02862c2 am: dd0be992 am: 117a3830 -s ours am: 368ae62e
am: 1d513c84
Change-Id: If920208b052d41a80d3a0bf70af831313c9b9c06