Merge "Merge "WifiConfiguration: add local only networkId" into oc-dev am: 46f4d5c4a6 am: 0ffff6a341"