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

Change-Id: I7330c5050c91e7dbaa99ca241f046b051fcd66a9