Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am: b51e98becb am: 7e890c8eb5 am: 08eb52f9f9 am: 58def3804c  -s ours am: e49de5e073
am: de13c7a45b

Change-Id: Ida35ef7c72e9f6717984c41bb4546e9981a0f598