Merge "Fixes v3 identity tests with policy actions with rule admin_or_owner."