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
Change-Id: Icfafc6e9d56a97777db1c3d0e0feae3305f6707f