Merge changes Id928678b,Ic55dbbe6 into rvc-dev

* changes:
  ConnectedNetworkScorerTest: Add test for connected network scorer
  ConnectedNetworkScorerTest: Add tests for wifi usability stats