Merge "Storage: Type against ILBFactory and ILoadBalancer in storage classes"