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
am: 9080d4462e

Change-Id: Idd437ad418ac2deaf08a9c0ac89cb518c216d8f1