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

Change-Id: Ief793ba94226d007c53601fe081e483622148b77