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