Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into...
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev am: badc5cd9 am: f1e0a4a6 am: 3cf8ad97 am: 80533d81
am: 79e84017 -s ours
Change-Id: Ifb69b82937442b01a05520c0cf8f5464e6b5f257