DO NOT MERGE: Clean up when recycling a pid with a pending launch
am: a92810a189  -s ours

Change-Id: Ic25323f818ee224640686c4e1d6c3b3f62ff828f