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

Change-Id: If18b8d2947a1bcddeda6f3cc7c74b8ce7ea536f5