Merge "Remove InterfaceController dependency on NMS"