Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c  -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b  -s ours" into nyc-dev am: 555fbf30d2 am: 80f80e7e70
am: 83623be331  -s ours

Change-Id: I32991c6c138d5ddfd96d71777e69c6690122afad