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