Merge change 25398 into eclair

* changes:
  Reintroduce wifi RssiApprox, reducing driver calls