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 am: 75c7391a41 am: f6361752ca
am: 7586e03e06  -s ours

Change-Id: I404e1cdbb507d5c48c31cd3fddc3ff5f9e1078b5