Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905  -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc  -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc  -s ours" into nyc-dev am: cca29c7284 am: 7c17f2ee60
am: b8dde176db  -s ours

Change-Id: Ieeaabc1be1397a89c98e45d86209dcd4472805c3