DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189  -s ours
am: 9be12f8986

Change-Id: Ie692388b7c4ad6492444347ac128d8cf83dd9e21