Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099  -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180  -s ours" into nyc-dev
am: 4ee46e5b99

Change-Id: Ifb42c3e05317e63ed428e1f542a691dacfb187a8