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

Change-Id: If6174229b0b6d378b7cf6c5f5618ce70d04c400b