Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending...

Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea9  -s ours am: f368bdee am: f21534a2 am: dfc2d0a4  -s ours am: 603a69ff am: 97194798 am: c35a9fed am: 71933abb  -s ours" into nyc-dev
am: cca29c72

Change-Id: I61a488a73884cbb0e9bb2886858d8ffe92b6ae34