Merge "override_role cleanup: Remove superfluous call in rbac_rule_validation"