Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c  -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b  -s ours" into nyc-dev am: 555fbf30d2 am: 12a668fde8 am: 148acfcb45 am: cb6f2eeb33
am: 035d0cfd74  -s ours

Change-Id: I7dbc1f67a3580b0e71cae083f5ab9186537deecc