Merge "Refactor interface IP code into InterfaceController" am: 9465abf8 am: 6a718fc8 am: 6fa8caab am: 4d4ff340 Change-Id: I49886d9a40a5348353f026b4293813c6f3d66187