Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905  -s ours
am: f368bdee06

Change-Id: I56d187b0466e674e423754818ba51ca0cdd61a3c