DO NOT MERGE: Clean up when recycling a pid with a pending launch am: d1eeb5b7b4 am: 29ae7b1a27 am: 39c7879365 am: 5841c492a7  -s ours am: f705730667 am: d09a6aa0f0
am: 110bd114a8

Change-Id: Ia23820f580ae6fd4345e6fe4bd844b33e2459907