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: 105453e170
am: 8887e258a9

Change-Id: Ic9dfa00be5c10ab4d09e55587fa25f8b88c0bbe2