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
am: 705b111461

Change-Id: Icc07729d64dfe0c7ec3c38f7f5a1323792558ae0