Merge "Change WifiTrackerFactory methods to static."