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
Change-Id: Ia4a5952bc4fda5be8602708215ff1d72a5db297a
This commit is contained in: