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

Change-Id: I76454a05fdeec94b84d0bfb6f084790e0a7f77d5