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

Change-Id: I432d8f625057a3e3e35e12910fc48319c723295e