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

Change-Id: I3c783e856777500d86cc5ae162ab82a727e42967