Merge changes Ic4500dc8,I32477db5 into sc-dev

* changes:
  [NS12] Address comments on NS09
  [NS11] Fix yieldToBadWifi over the policy scoring