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

Change-Id: I4470a56b330eb087ecd2f2662ad99fccbca917cf