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

Change-Id: I9372581fd75519c51d034f9bc59b62f7b67433af