Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am:...

Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a1  -s ours am: 9be12f89 am: 03b0f5c3 am: 7b814065  -s ours am: 9080d446 am: 75c7391a am: f6361752 am: 7586e03e  -s ours" into nyc-dev am: 5f5403de am: d8ffc623 am: 710c5ea5 am: 586fa0ce
am: ca6c0df7  -s ours

Change-Id: I23912c855ccf7ba59373f241701e508bbe6d6c57