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

Change-Id: Ia473e706d7b50376fffb122e03e48bd947f47562