Merge changes I32c12702,I688593cc

* changes:
  [NS D04] Implement a simple speed comparison between scores.
  [NS D03] Migrate the bad wifi avoidance policy
tree: 4e01d2f3f22ec1d43376fdf05d8451e928afdc17
  1. core/
  2. services/
  3. tests/