Merge "Clean up when recycling a pid with a pending launch" into nyc-mr1-dev
am: 792aaab77a

Change-Id: I908d6adb238d47b42f4c756e07ec1d0ac137f8d5