DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a1 -s ours am: 9be12f89 am: 03b0f5c3 Change-Id: Ic8565bef0bbd034c4d54eff428731809b29ee0c3