DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a3af5c6207 am: 21ef672cab
am: e0d1ff1c42  -s ours

Change-Id: I8a1464443e84bb7987235d25ad40ae01386d72ef