Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7
am: c8aedeeaf6

Change-Id: Id8f62a0c41004aa713d61a87f59e7ee1eff4ee0a