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

Change-Id: I6d7353ed5154dfa3c6d556e4701c8c8e4f66feac