Merge "Remove the unnecessary dependent on WifiTrackerLib." into rvc-dev