Merge "Revert "Revert "[S-RBAC] Switch to new policies by default"""