DO NOT MERGE: Clean up when recycling a pid with a pending launch am:...
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: 55eacb94 am: ac9bb388 am: 250a509a am: 9b3f1e26
am: 3b0ad6e8 -s ours
Change-Id: I9c6f27b3c55ab57950e189287931b5cc95f1f5f1