Merge "Refactor interface IP code into InterfaceController" am: 9465abf8af am: 6a718fc858
am: 6fa8caab73

Change-Id: I1882be43dce90cac8a2a6fcf34dc534c64bd4e7d