Merge "Clear AccessPoints in WifiTracker when Wifi is Off." into oc-dr1-dev