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
am: 52d0f48f80

Change-Id: I01d36d2e160c3e33e3f2701843d768b5f581af1b