Merge "Add extra debug logging to WifiTracker." into oc-dev