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

Change-Id: I4e5a6b4eb30dde276a1293e986398a8dba21ef05