Merge "Merge "Optimize AttributionSource tokens - base" into sc-dev am: 2b90cc827b am: 01f6847c8a am: 6ea948034d"