DO NOT MERGE: Clean up when recycling a pid with a pending launch am: 55eacb9441
am: b7380a1c0c

Change-Id: I3ec336f6d7a58b6e87c6b99693e8f1ec2a3ad075