Merge "WifiConfiguration: add local only networkId" into oc-dev