Merge changes from topic "am-e016a42241c4492b956e583fcfbd7c32"

* changes:
  [automerger skipped] Merge "DO NOT MERGE Revert "Fix vulnerability in AttributionSource due to incorrect ..."" into sc-dev am: 17d50406 am: 8bafaa0e -s ours am: 595e0d12 -s ours am: 606e3efa -s ours am: b67d221a -s ours am: 4ce025f5 -s ours am: 09f74c19 -s ours
  [automerger skipped] DO NOT MERGE Revert "Fix vulnerability in AttributionSource due to incorrect ..." am: 9858b3c3 am: 4d33e3d2 -s ours am: 1d9d76f1 -s ours am: 40727700 -s ours am: 63433a69 -s ours am: e950ace6 -s ours am: b598f0b0 -s ours