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

Change-Id: I2e5245a4c765eaf6ab81b06b3b7081743951c259