Merge changes I84f39225,I4113ae74

* changes:
  WakeupEvaluator - use ScoringParams properly
  Don't cache wifi ScoringParams values