Merge "Metrics for connected wifi score" into oc-mr1-dev