Merge "Revert "Refactor IpConfiguration from WifiConfiguration""