Merge "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" into nyc-dev am: 5f5403def8 am: fd539fc8e0
am: 4c693343b7  -s ours

Change-Id: I807b584d82df5f8a104912ec4a65b8fb28449ac0