Merge "Fix role validation edge case bug in rbac_utils"