Merge "DO NOT MERGE Revert "Fix vulnerability in AttributionSource due to incorrect ..."" into sc-dev