Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev
am: badc5cd942

Change-Id: I185ac4f8a3a7905510e3dbe805aebfbdedec049c