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 am: 02ba5ef875 am: 26fa4042e1 am: c16baae14f am: c44432439f
am: b1b4527845  -s ours

Change-Id: I82ac9193e47a5b3b3afbbca5fb7e9f5a7655dd7b