Merge "Move IPv4 address setting to IpManager" into nyc-dev