Merge "Remove global namespaced LBFactory"