Merge change 2229

* changes:
  Add carrier/mcc factors to wifi-channel decision.