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

Change-Id: Iff19ad943b40ba317542ddebb505eb27175ac627