Merge "Revert "Introduce AttributionAndPermissionUtils."" into 24D1-dev