Merge "WifiConfiguration validation improvement"