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

Change-Id: Iee8ffdde7970a5c623f4820d3e27531df2beb795