Merge "Clean up when recycling a pid with a pending launch" into nyc-mr1-dev am: 792aaab77a am: c76f8c1b55
am: 1727db3961

Change-Id: I5240e943a397f59f4095ede9b3b618836c3ad4ba