Merge "Revert "Add PID and UID default to AttributionSourceState"" into sc-dev