Merge "Refactor ConfigureWifiSettings for better testing"