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

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

Change-Id: Ie94c3c24a3b07c26c8b363358f4df1d7366d95a2