DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27
am: 39c7879365

Change-Id: I36e3a9a580c73dc61b5de35740bc4d7206a6e0b7