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 am: 2ea71d8c am: 2c18f323 am: 7a50c5af
am: d1f79e54  -s ours

Change-Id: I64c762bd9f94b0b271a20bbcc2e532541bb963f0