Merge "Fix failing WifiConfigManagerTest test."