Merge "WifiManager: add unspecified ip mode" am: dae92faa02 am: 0b9fa27619 am: 610a0db7a2  -s ours
am: 74ff0748ce  -s ours

Change-Id: I71fa9c7e5c8e5efcf864b5fee10b5ebc929f8a55