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

Change-Id: I00d2208a02f04cc5ca58a66977ddcf8b4da1983a