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-dev am: 96052ea9 -s ours
am: f368bdee
Change-Id: I56d187b0466e674e423754818ba51ca0cdd61a3c