Merge "Remove singleton from RbacUtils constructor"