Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into...
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214a am: c8aedeea am: 26bb7bf8 -s ours
am: 86ac88cc
Change-Id: Ia473e706d7b50376fffb122e03e48bd947f47562