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: 2ea71d8c64

Change-Id: I66c2b69d13949c64390081ac7f8e868d6f025d95