DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189  -s ours am: 9be12f8986 am: 03b0f5c3ec
am: 7b8140652b  -s ours

Change-Id: I40d855d0f87483a6a8733475b490ddf6ee582433