Merge "Always use SSID average for SpeedLabel." into oc-mr1-dev