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

Change-Id: I46fc6ca0334f2637007fc188304310475267a20c