Merge "APs from old scans should not have RSSI values set." into oc-dev