Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905  -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc  -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc  -s ours am: 02ba5ef875 am: 26fa4042e1 am: c16baae14f am: c44432439f" into nyc-mr1-dev-plus-aosp
am: 2360e2a8c0  -s ours

Change-Id: If80948de9d7b7a1dd9e5283e5333e9dc9f9f1641