Merge "Fix for F/C in WifiConfigInfo"