Merge "[TrivialFix] Remove redundant function in RbacUtils class"