Merge changes from topic "revert-10338939-YCRBMILGZV"

* changes:
  Revert "[NS D03] Migrate the bad wifi avoidance policy"
  Revert "[NS D04] Implement a simple speed comparison between scores."