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

Change-Id: I2c61f237e4d9a2717d3c630cd0ea24934e13fc6b