DO NOT MERGE: Clean up when recycling a pid with a pending launch am: 55eacb94 am: ac9bb388 am: 250a509a am: 9b3f1e26 Change-Id: I72b1878607419e2374e15cd5e6b23b5fdec335fe