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

Change-Id: Ic86e58a455b3d8d7bb2c2ed7eee66910e28115ca