Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189 -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06 -s ours" into nyc-dev
am: 5f5403def8
Change-Id: If316a8c2efca734d3118214bf7c93d8f0d22a4c0
This commit is contained in: