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
am: 5eed3c9c
Change-Id: I4470a56b330eb087ecd2f2662ad99fccbca917cf