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

Change-Id: I49886d9a40a5348353f026b4293813c6f3d66187