Merge "Properly iterate over packages in UID."