Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into...
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev am: badc5cd9 am: 8b948eee
am: 584f7039 -s ours
Change-Id: I1f0236689af17520574616bd59017cb7bed7a367