Merge "Sort APs by Speed label value instead of ranking score." into oc-mr1-dev