Merge "Merge "Optimize AttributionSource tokens - base" into sc-dev am: 2b90cc82 am: 01f6847c am: 6ea94803"