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

Change-Id: Ia37f8295ee5843412cf4045764b469ee48608f07