Merge "Increase unit test coverage for rbac_utils."