Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c  -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b  -s ours am: 6a9490f850 am: 6a031dec20
am: 5bb02677a8  -s ours

Change-Id: I197594b1afcb701b6751b1ce8f8968b6689eb456