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

Change-Id: If920208b052d41a80d3a0bf70af831313c9b9c06