Merge changes Iff3f94df,I6ba72679

* changes:
  [ScoreCardBasedScorer] A CandidateScorer using scorecards
  [WifiCandidates] CandidateScorer control over legacy user choice