Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending...

Merge "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 am: 2490679d am: 2f664374 am: bc5775c1  -s ours" into nyc-dev am: 555fbf30 am: 80f80e7e
am: 83623be3  -s ours

Change-Id: I32991c6c138d5ddfd96d71777e69c6690122afad