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