Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev am: badc5cd9 am: 8b948eee Change-Id: I21bc52830b06f83d2295452863fdcc91ab41986f