Merge "Always use SSID average for SpeedLabel." into oc-mr1-dev
am: 6c198f9e57

Change-Id: Ib082ef434dff8a633f30b4d29d80ce361f921199