Merge "Remove InterfaceController dependency on NMS"
am: 06adb08d27

Change-Id: I24c129d143f49434c126855dd90f7a0436d00ca5