Merge "Fix flaky WifiTracker tests."