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

Change-Id: I7916f77c66d928bd1b1dd5616f2a478119263f2a