Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev am: badc5cd942 am: 8b948eee03
am: 584f703907  -s ours

Change-Id: I1f0236689af17520574616bd59017cb7bed7a367