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

Change-Id: I6fb134e75355bc1fdcc2dd9a21b51802575c28f3