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

Change-Id: I2c80ab0bfc79d61414af9ba50362256ce68ddd8c