Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099  -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180  -s ours" into nyc-dev am: 4ee46e5b99 am: fda97bed8d am: af4f11bdf6 am: e18ec512c6
am: 812e355289  -s ours

Change-Id: I1be74b423bff90adaa614a333a8cd2fc67987569