Merge "Do not set config netId to argument netId in WifiServiceImpl#connect" into sc-dev