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
am: d8ffc6239b

Change-Id: Ibcaa7f162284c8a18fc68202fc169284e37099e5