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
am: 4a3caefd6c
Change-Id: I84e6f42dc34fcddf3b6e2d34250f96db2e137bed
This commit is contained in: