Merge "Revert "Revert "Fix vulnerability in AttributionSource due to in..."" into tm-dev