Merge changes Ic4500dc8,I32477db5 into sc-dev

* changes:
  [NS12] Address comments on NS09
  [NS11] Fix yieldToBadWifi over the policy scoring
tree: e68ad8427a46cf83ca89cf82658abd55bfb471ef
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING